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/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