Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

2025-12-13 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

 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>