From 7ba995f514c6d20a59cc69afa05110110e9b2de5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 十月 2023 08:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into skwcs

---
 src/main/resources/mapper/BasShuttleErrLogMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/BasShuttleErrLogMapper.xml b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
index e554833..ba98429 100644
--- a/src/main/resources/mapper/BasShuttleErrLogMapper.xml
+++ b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
@@ -11,7 +11,6 @@
         <result column="end_time" property="endTime" />
         <result column="wrk_sts" property="wrkSts" />
         <result column="io_type" property="ioType" />
-        <result column="ste_no" property="steNo" />
         <result column="plc_no" property="plcNo" />
         <result column="loc_no" property="locNo" />
         <result column="sta_no" property="staNo" />
@@ -26,6 +25,7 @@
         <result column="update_time" property="updateTime" />
         <result column="update_by" property="updateBy" />
         <result column="memo" property="memo" />
+        <result column="system_status" property="systemStatus" />
 
     </resultMap>
 

--
Gitblit v1.9.1