Merge branch 'dev/feat/partner1.1_20230727' into hxd/fix/SyncCustomer3.0

2023-07-28 13:52:25 +08:00
parent 2a861d7904 0669c4ad2d
commit 2d93d67fb1
6 changed files with 23 additions and 19 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
@@ -80,4 +80,6 @@ public class HyPartnerLineInfoDO implements Serializable {
    @ApiModelProperty("移除黑名单原因")
    private String removeBlackReason;

+    @ApiModelProperty("hy_partner_user_channel.channel_id")
+    private Integer userChannelId;
 }
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
@@ -71,5 +71,6 @@ public class HyPartnerUserInfoDO implements Serializable {
    @ApiModelProperty("推荐加盟商手机号")
    private String recommendPartnerMobile;

+    @ApiModelProperty("hy_partner_user_channel.channel_id")
    private Integer userChannelId;
 }