suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250324

Browse Source
This commit is contained in:
shuo.wang
2025-03-26 14:08:40 +08:00
parent 1d82a08d37 4e919f0172
commit 193f35bded
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -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结")

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -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());