From daf21ebd4b8f6672d93f33e68e03959481b10060 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 08:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

---
 src/main/webapp/static/js/common.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1920a7b..44076bf 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -262,7 +262,8 @@
     ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
     ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
     ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
-    ,{field: 'locType2$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
+    // ,{field: 'locType2$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
+    ,{field: 'matType$', align: 'center',title: '涓婃灦鍖哄煙'}
 ]
 
 function getQueryVariable(variable)

--
Gitblit v1.9.1