Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -470,7 +470,7 @@
             <if test="param.consignee != null and param.consignee != ''" >and ldr.consignee  = #{param.consignee } </if>
             <if test="param.deliveryPhone != null and param.deliveryPhone != ''" >and ldr.deliveryPhone = #{param.deliveryPhone } </if>
             <if test="param.deliveryAddress != null and param.deliveryAddress != ''" >and ldr.deliveryAddress  = #{param.deliveryAddress } </if>
-            <if test="param.warehouseName != null and param.warehouseName != ''" >and lds.warehouseName = #{param.warehouseName } </if>
+            <if test="param.warehouseId != null " >and lds.warehouse_id = #{param.warehouseId } </if>
             <if test="param.mallName != null and param.mallName != ''" >and ldr.mallName = #{param.mallName } </if>
             <if test="param.storeName != null and param.storeName != ''" >and ldr.storeName  = #{param.storeName } </if>
             <if test="param.driverSigning != null and param.driverSigning != ''" >and lds.driver_signing = #{param.driverSigning } </if>