From 79008aa661035e2477a274b2fb97cb19504ea157 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Mar 2025 14:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/response/AddSignFranchiseResponse.java | 4 +++- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index c2fde0640..1eeccff49 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -129,8 +129,10 @@ public class AddSignFranchiseResponse { private Date firstYearStartTime; @ApiModelProperty("1结") private Date firstYearEndTime; - @ApiModelProperty("1费") + @ApiModelProperty("1品牌使用费") private String firstYearFee; + @ApiModelProperty("1管理费") + private String firstYearManageFee; @ApiModelProperty("2开") private Date secondYearStartTime; @ApiModelProperty("2结") 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 9077902c3..d35c48ddb 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 @@ -352,6 +352,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setFirstYearStartTime(franchiseFeeDO.getFirstYearStartTime()); addSignFranchiseResponse.setFirstYearEndTime(franchiseFeeDO.getFirstYearEndTime()); addSignFranchiseResponse.setFirstYearFee(franchiseFeeDO.getFirstYearFee()); + addSignFranchiseResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee()); addSignFranchiseResponse.setSecondYearStartTime(franchiseFeeDO.getSecondYearStartTime()); addSignFranchiseResponse.setSecondYearEndTime(franchiseFeeDO.getSecondYearEndTime()); addSignFranchiseResponse.setSecondYearFee(franchiseFeeDO.getSecondYearFee());