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

lty

2025-12-13 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

 src/main/resources/mapper/BasCrnpMapper.xml

@@ -25,7 +25,7 @@
        <result column="emp_in" property="empIn" />
        <result column="tank_qty" property="tankQty" />
        <result column="tank_qty1" property="tankQty1" />

        <result column="origin" property="origin" />
    </resultMap>

</mapper>