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

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

@@ -124,7 +124,7 @@
         '' as deliveryVolume,
         '' as sendWarehouse,
         '' as tranPrice,
-        case when m.deliver_type = '1' then ifNull(r.amount_ed_payable,0) else 0 end as freight,
+        0 as freight,
         '' as supplier,
         w.goods_name as goodsName,
         case when w.goods_name like '%潮粮%' then '潮粮' else '干粮' end as type,