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/basLiftOpt/basLiftOpt.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
index 645a9db..977e32f 100644
--- a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
+++ b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
@@ -25,11 +25,13 @@
             {field: 'id', align: 'center',title: '缂栧彿'}
             ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
             ,{field: 'liftNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+            ,{field: 'command', align: 'center',title: '鍛戒护'}
+            ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
+            ,{field: 'deviceWrk', align: 'center',title: '璁惧宸ヤ綔鍙�'}
             ,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
             ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            ,{field: 'command', align: 'center',title: '鍛戒护'}
 
             // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],

--
Gitblit v1.9.1