Merge branch 'test' into pre-production

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -344,7 +344,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					Long clientEntityId = basicdataClientEntity.getId();//基础客户
 					BasicdataStoreBusinessEntity basicdataStoreBusinessEntity =  basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntityId,3);
 					if(!Objects.isNull(basicdataStoreBusinessEntity)){
-						distributionStockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+						distributionStockArticleEntity.setTypeService(Integer.parseInt(basicdataStoreBusinessEntity.getMold()));
 					}
 				}
 				distributionStockArticleEntity.setCustomerName(customerName);