Merge branch 'dev' of http://47.108.105.48:3000/java_project/logisticsplatform-service into dev

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

@@ -794,15 +794,12 @@
                             #{item}
                         </foreach>
                     </if>
-
                     <if test="warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(warehouseIdList)">
                         and lddl.warehouse_id in
                         <foreach collection="warehouseIdList" item="item" open="(" close=")" separator=",">
                             #{item}
                         </foreach>
                     </if>
-
-
                     <if test="param.createTime_query!=null and param.createTime_query!=''">
                         and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
                     </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -2920,6 +2920,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			 */
 			List<Long> warehouseIdList = getWarehouseIdList();
 
+			log.info(">>> 仓库ID {}",warehouseIdList);
+
 			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList);
 		}