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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
This commit is contained in:
zhangchenbiao
2023-06-21 15:16:38 +08:00
parent 0750d68809 bbf3d47de5
commit 8d46abeab0
17 changed files with 146 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ZoneCheckDTO.java
View File

@@ -12,6 +12,8 @@ public class ZoneCheckDTO {
private Long openAreaMappingId;
private Long zoneId;
private String areaName;
private String zoneName;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java
View File

@@ -62,9 +62,6 @@ public class PartnerLineInfoVO {
@ApiModelProperty("冷静期首次登录 是-true 否-false")
private Boolean coolingPeriodFirstLoginFlag;
@ApiModelProperty("加盟商用户ID")
private String partnerUserId;
@ApiModelProperty("加盟商用户名称")
private String partnerUserName;