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

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

@@ -0,0 +1,21 @@
+package com.cool.store.dto.partner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/16 17:38
+ * @Version 1.0
+ */
+@Data
+public class InviteCodeDetailDTO {
+    @ApiModelProperty("推荐加盟商名称")
+    private String partnerName;
+    @ApiModelProperty("推荐加盟商手机号码")
+    private String partnerPhone;
+    @ApiModelProperty("邀请码")
+    private String inviteCode;
+    @ApiModelProperty("门店名称")
+    private String storeName;
+}

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

@@ -86,4 +86,16 @@ public class HyPartnerIntentInfoDO implements Serializable {
 
     @ApiModelProperty("更新时间")
     private Date updateTime;
+
+    @ApiModelProperty("通过原因")
+    private String passCause;
+
+    @ApiModelProperty("通过时间")
+    private Date passTime;
+
+    @ApiModelProperty("通过人ID")
+    private String passUser;
+
+    @ApiModelProperty("通过证明")
+    private String passCertifyFile;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java

@@ -88,4 +88,19 @@ public class PartnerIntentInfoVO {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("通过原因")
+    private String passCause;
+
+    @ApiModelProperty("通过时间")
+    private Date passTime;
+
+    @ApiModelProperty("通过人名称")
+    private String passUserName;
+
+    @ApiModelProperty("通过人ID")
+    private String passUserId;
+
+    @ApiModelProperty("通过证明")
+    private String passCertifyFile;
+
 }

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

@@ -17,7 +17,8 @@ import java.util.Date;
 public class PartnerLineInfoVO {
 
     @ApiModelProperty("")
-    private Long id;
+    private Long lineId;
+
 
     @ApiModelProperty("hy_partner_user_info.partner_id")
     private String partnerId;