Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -108,7 +108,7 @@
         w.box_no_other as boxNoOther,
         w.title_no as titleNo,
         w.title_no_other as titleNoOther,
-        m.unit_contract_price as netWeightPrice,
+        s.settlement_price as netWeightPrice,
         s.gross_weight as grossWeight,
         s.tare as tare,
         s.deduction_weight as buckleWeight,