From 78ff74dfc9c42ee12993ac01c43063d0432231e3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

---
 src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
index a158b94..241c6bb 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
@@ -39,6 +39,7 @@
             ,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
             ,{field: 'error', align: 'center',title: '寮傚父'}
             ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+            ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
             ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
             ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}

--
Gitblit v1.9.1