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

zhou zhou

5 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 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>