From ec3dc540e963abee93313e104ce730317aa68b42 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 8 Aug 2025 13:45:17 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9ABUG=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java | 2 +- .../ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java index 0772e1ccb..a6814de64 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreCertificate.java @@ -76,7 +76,7 @@ public class StoreCertificate extends XktBaseEntity { * 统一社会信用代码 */ @Excel(name = "统一社会信用代码") - private Integer socialCreditCode; + private String socialCreditCode; /** * 经营类型 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 77e2406a9..9bfdca020 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -168,7 +168,8 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) ? FileType.ID_CARD_EMBLEM.getValue() : FileType.BUSINESS_LICENSE.getValue()))) .collect(Collectors.toList()); - return new StoreCertStepResDTO().setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class).setFileList(fileDTOList)) + return new StoreCertStepResDTO().setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class) + .setStoreCertId(storeCert.getId()).setFileList(fileDTOList)) .setStoreBasic(BeanUtil.toBean(store, StoreCertStepResDTO.SCSStoreBasicDTO.class)); }