From a23b44f21f596c5500bda617050aa72125e2e701 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 07 十月 2023 12:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/static/js/basShuttle/basShuttle.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/basShuttle/basShuttle.js b/src/main/webapp/static/js/basShuttle/basShuttle.js
index 3acf500..dd19072 100644
--- a/src/main/webapp/static/js/basShuttle/basShuttle.js
+++ b/src/main/webapp/static/js/basShuttle/basShuttle.js
@@ -27,7 +27,7 @@
,{field: 'shuttleStatus', align: 'center',title: '浣滀笟鎬�'}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
- ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數'}
+ // ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數'}
,{field: 'chargeLine', align: 'center',title: '鐢甸噺绾�'}
,{field: 'busyStatus$', align: 'center',title: '灏忚溅蹇欑姸鎬�'}
,{field: 'currentCode', align: 'center',title: '浜岀淮鐮�'}
--
Gitblit v1.9.1