From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

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

diff --git a/src/main/resources/mapper/BasArmMastLogMapper.xml b/src/main/resources/mapper/BasArmMastLogMapper.xml
index f025919..006a8fa 100644
--- a/src/main/resources/mapper/BasArmMastLogMapper.xml
+++ b/src/main/resources/mapper/BasArmMastLogMapper.xml
@@ -22,6 +22,7 @@
         <result column="create_time" property="createTime" />
         <result column="arm_error" property="armError" />
         <result column="arm_msg" property="armMsg" />
+        <result column="barcode" property="barcode" />
 
     </resultMap>
 

--
Gitblit v1.9.1