Merge branch 'dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -357,6 +357,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			BeanUtil.copyProperties(entity, distributionStockListInfo);
 			distributionStockListInfo.setSourceType("2");//导入
 			distributionStockListInfo.setQuantityStock(num);
+			distributionStockListInfo.setId(null);
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}