diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java index 16403192f..30c281c8a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java @@ -33,7 +33,7 @@ public class SignFranchiseDO { @Column(name = "contract_start_time") private Date contractStartTime; @Column(name = "contract_end_time") - private Date contractStartEndTime; + private Date contractEndTime; @Column(name = "impression_num") private String impressionNum; @Column(name = "business_start_hours") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 813647a1b..8a3447ea3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -65,7 +65,7 @@ public class AddSignFranchiseRequest { signFranchiseDO.setIsBusinessLicense(this.isBusinessLicense); signFranchiseDO.setIsFoodLicense(this.isFoodLicense); signFranchiseDO.setContractStartTime(this.contractStartTime); - signFranchiseDO.setContractStartEndTime(this.contractStartEndTime); + signFranchiseDO.setContractEndTime(this.contractStartEndTime); signFranchiseDO.setImpressionNum(this.impressionNum); signFranchiseDO.setBusinessStartHours(this.businessStartHours); signFranchiseDO.setBusinessEndHours(this.businessEndHours); 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 377b27173..f03583058 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 @@ -340,7 +340,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setIsBusinessLicense(signFranchiseDO.getIsBusinessLicense()); addSignFranchiseResponse.setIsFoodLicense(signFranchiseDO.getIsFoodLicense()); addSignFranchiseResponse.setContractStartTime(signFranchiseDO.getContractStartTime()); - addSignFranchiseResponse.setContractStartEndTime(signFranchiseDO.getContractStartEndTime()); + addSignFranchiseResponse.setContractStartEndTime(signFranchiseDO.getContractEndTime()); addSignFranchiseResponse.setImpressionNum(signFranchiseDO.getImpressionNum()); addSignFranchiseResponse.setBusinessStartHours(signFranchiseDO.getBusinessStartHours()); addSignFranchiseResponse.setBusinessEndHours(signFranchiseDO.getBusinessEndHours());