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

lty

6 天以前 d66bc1821a36fd9272292bfa9d9c0980359e9ae0

 src/main/resources/mapper/BasArmMastMapper.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>

@@ -31,6 +32,7 @@
        where 1=1
          and arm_no = #{armNo}
          and sorting_line = #{sortingLine}
          and sta_no = #{staNoEnd}
          and status = #{status}
    </update>