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

1

2025-12-24 c7a31680a32a45c7d47af5162eb8edcb9824d16a

 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>