From d431a0205fb6abbe4387bd72f1cdbed85881ffd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 28 Nov 2025 11:18:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dto/ContractInformationDTO.java | 4 ++-- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java index 85bc300b2..170dbd580 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java @@ -94,9 +94,9 @@ public class ContractInformationDTO { private Integer contractServiceLife; @ApiModelProperty(name = "合同开始时间") - private Date contractStartTime; + private String contractStartTime; @ApiModelProperty(name = "合同结束时间") - private Date contractEndTime; + private String contractEndTime; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 1b4f27847..3e5f9b81a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -577,8 +577,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount()); contractInformationDTO.setSummitUserName(userName); contractInformationDTO.setCurrency(signFranchiseDO.getCurrency()); - contractInformationDTO.setContractStartTime(signFranchiseDO.getContractStartTime()); - contractInformationDTO.setContractEndTime(signFranchiseDO.getContractEndTime()); + contractInformationDTO.setContractStartTime(DateUtils.dateTime(signFranchiseDO.getContractStartTime())); + contractInformationDTO.setContractEndTime(DateUtils.dateTime(signFranchiseDO.getContractEndTime())); contractInformationDTO.setContractServiceLife(signFranchiseDO.getContractServiceLife()); //老店转加盟(也叫直营转加盟)