From 9388b1d64f4b5da813857f9939f32018e5e2681c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 09 十月 2023 10:40:44 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

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

diff --git a/src/main/webapp/static/js/wrkCharge/wrkCharge.js b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
index 846bfed..a0538f1 100644
--- a/src/main/webapp/static/js/wrkCharge/wrkCharge.js
+++ b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
@@ -27,8 +27,7 @@
             // ,{field: 'mk', align: 'center',title: '鏍囪'}
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             // ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
-            ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
-            ,{field: 'steNo$', align: 'center',title: '绌挎杞�'}
+            ,{field: 'shuttleNo', align: 'center',title: '绌挎杞�'}
             ,{field: 'charge', align: 'center',title: '鍏呯數妗�'}
             // ,{field: 'outMost', align: 'center',title: '宸烽亾鍙�'}
             // ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}

--
Gitblit v1.9.1