From 41fa9a0f2f5cd0ffc9bd96e11f00245ea3567b9b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 23 六月 2022 15:49:40 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/webapp/static/js/locMast/locMast.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 98692a4..54454f9 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -15,6 +15,7 @@
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
         even: true,
+        // size: 'sm',
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[

--
Gitblit v1.9.1