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/basShuttleErrLog/basShuttleOpt.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
index 6fbeae0..aa8aead 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
@@ -28,6 +28,7 @@
             ,{field: 'distLocNo', 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: '淇敼浜哄憳'}

--
Gitblit v1.9.1