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

zwl

2 天以前 6cfcd3471b380c483ab06c709c028eb94ba2a2b2

 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>