Merge remote-tracking branch 'origin/master-shw' into dev

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseLineSearchVO.java

@@ -15,6 +15,8 @@ public class WarehouseLineSearchVO {
     private Long destCityId;
     /**目的地城市*/
     private Long destCountryId;
+    /**目的仓*/
+    private Long destWarehouseId;
     /**渠道id*/
     private Long channelId;
 

yudao-module-depository/yudao-module-depository-core/src/main/resources/mapper/warehouse/WarehouseLineMapper.xml

@@ -52,6 +52,9 @@
             <if test="params.destCountryId != null and params.destCountryId != 0">
                 and ew_dest.guojia = #{params.destCountryId}
             </if>
+            <if test="params.destWarehouseId != null and params.destWarehouseId != 0">
+                and ewl.dest_warehouse_id = #{params.destWarehouseId}
+            </if>
             <if test="params.lineId != null and params.lineId != 0">
                 and ewl.id = #{params.lineId}
             </if>