From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/resources/mapper/BasShuttleMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/BasShuttleMapper.xml b/src/main/resources/mapper/BasShuttleMapper.xml
index 724891e..4860a85 100644
--- a/src/main/resources/mapper/BasShuttleMapper.xml
+++ b/src/main/resources/mapper/BasShuttleMapper.xml
@@ -8,21 +8,20 @@
<result column="status" property="status" />
<result column="shuttle_status" property="shuttleStatus" />
<result column="wrk_no" property="wrkNo" />
- <result column="row" property="row" />
- <result column="bay" property="bay" />
- <result column="lev" property="lev" />
- <result column="his_row" property="hisRow" />
- <result column="his_bay" property="hisBay" />
- <result column="his_lev" property="hisLev" />
<result column="idle_loc" property="idleLoc" />
<result column="auto_charge" property="autoCharge" />
<result column="charge_line" property="chargeLine" />
+ <result column="suggest_charge_line" property="suggestChargeLine" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
- <result column="lift_no" property="liftNo" />
+ <result column="pak_mk" property="pakMk" />
+
+ <result column="run_speed" property="runSpeed" />
+ <result column="device_status" property="deviceStatus" />
+ <result column="disable_lev" property="disableLev" />
</resultMap>
--
Gitblit v1.9.1