From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
index bdf3e33..aa8aead 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
@@ -27,6 +27,8 @@
,{field: 'sourceLocNo', align: 'center',title: '璧风偣搴撲綅'}
,{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