Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java

@@ -1,5 +1,6 @@
 package com.cool.store.dto.wx;
 
+import com.cool.store.enums.UserChannelEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -24,4 +25,6 @@ public class MiniProgramLoginDTO {
 
     @NotBlank(message = "ivStr不能为空")
     private String ivStr;
+
+    private UserChannelEnum userChannelEnum;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java

@@ -80,6 +80,4 @@ public class HyPartnerLineInfoDO implements Serializable {
     @ApiModelProperty("移除黑名单原因")
     private String removeBlackReason;
 
-    @ApiModelProperty("hy_partner_user_channel.id")
-    private Integer userChannelId;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java

@@ -70,4 +70,6 @@ public class HyPartnerUserInfoDO implements Serializable {
 
     @ApiModelProperty("推荐加盟商手机号")
     private String recommendPartnerMobile;
+
+    private Integer userChannelId;
 }