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

whycq

2023-09-15 a9e8a91fd4c8c504d7df9ef921f32d832390e77d

 src/main/resources/mapper/LocMastMapper.xml

@@ -34,6 +34,9 @@
        <result column="mk" property="mk" />
        <result column="barcode" property="barcode" />
        <result column="ctn_no" property="ctnNo" />
        <result column="pack_status" property="packStatus" />
        <result column="fire_status" property="fireStatus" />
        <result column="fire_no" property="fireNo" />
        <result column="channel" property="channel" />

    </resultMap>