From f0b2efeb0d413e796ae7317049c636fd4aa6d345 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 28 Jun 2023 17:14:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/entity/BasicdataStoreBusinessEntity.java | 2 +- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java index 3b55e762f..f9ed2450c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java @@ -74,6 +74,6 @@ public class BasicdataStoreBusinessEntity extends TenantEntity { * 服务类型—类型 */ @ApiModelProperty(value = "服务类型—类型") - private Integer mold; + private String mold; } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 542ff12a6..1274e8a5b 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/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);