From 30b2d8dde49639824f2a9c8f5b3e9b99b4b09e80 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 08 一月 2023 23:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/static/js/common.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7698016..fa8e0a3 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -221,8 +221,8 @@
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'storeMax$', align: 'center',title: '搴撳瓨涓婇檺'}
,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
- ,{field: 'storeMaxDate$', align: 'center',title: '鏈�澶ф粸鐣欐椂闂�'}
- ,{field: 'inoutEveryday$', align: 'center',title: '棰戠箒鍏ュ嚭搴撶墿鏂�'}
+ ,{field: 'storeMaxDate$', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ ,{field: 'inoutEveryday$', align: 'center',title: '楂橀', width: 60}
]
@@ -260,5 +260,6 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]
--
Gitblit v1.9.1