From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/static/js/mat/mat.js |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..6c1723a 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,11 +5,15 @@
     var cols = [
         {type: 'checkbox'}
         ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
+        ,{field: 'storeMax', align: 'center',title: '搴撳瓨涓婇檺',width: 90}
+        ,{field: 'storeMin', align: 'center',title: '搴撳瓨涓嬮檺',width: 90}
+        ,{field: 'storeMaxDate', align: 'center',title: '搴撻緞涓婇檺(澶�)',width: 90}
+        ,{field: 'status$', align: 'center',title: '鐘舵��'}
     ];
     cols.push.apply(cols, matCols);
     cols.push(
         {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        )
+    )
     return cols;
 }
 

--
Gitblit v1.9.1