From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +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