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
This commit is contained in:
俞扬
2023-06-28 16:48:19 +08:00
parent c675db67b6 3c57e28d47
commit c696b33d65
11 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java Normal file
View File

@@ -0,0 +1,12 @@
package com.cool.store.dto.mdm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AreaSonDTO {
@ApiModelProperty("父级code")
private String code;
}

43
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java
View File

@@ -30,56 +30,17 @@ public class HyPartnerCertificationInfoDO implements Serializable {
@ApiModelProperty("hy_partner_interview.id")
private Long partnerInterviewId;
@ApiModelProperty("合作关系:1总部下属;2小区代直营;3县代直营;4县代下属;5区代直营;6区代下属")
private String partnership;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("意向合同编号")
private String intentionContractNo;
@ApiModelProperty("意向签约时间")
private Date wantSignTime;
@ApiModelProperty("数据来源")
private String dataSource;
@ApiModelProperty("加盟费")
private String partnerFee;
@ApiModelProperty("保证金")
private String securityFund;
@ApiModelProperty("技术服务费")
private String technicalServiceFee;
@ApiModelProperty("意向金金额")
private String intentionMoney;
@ApiModelProperty("意向签约人姓名")
private String intentionSignerUsername;
@ApiModelProperty("意向签约人手机号")
private String intentionSignerMobile;
@ApiModelProperty("意向签约人学历")
private String intentionEdu;
@ApiModelProperty("实控人姓名")
private String realControlUsername;
@ApiModelProperty("实控人身份证")
private String realControlIdcard;
@ApiModelProperty("签约人与实控人关系")
private String signerRealControlRelation;
@ApiModelProperty("其他实控人与签约人关系")
private String signerOtherRealControlRelation;
@ApiModelProperty("实控人与签约人关系证明")
private String signerRealControlRelationCert;
@ApiModelProperty("发起资质审核信息记录json字段")
private String certificationInfoRecordJson;
@ApiModelProperty("创建时间")
private Date createTime;

4
coolstore-partner-model/src/main/java/com/cool/store/entity/ApprovalRegionDO.java → coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java
View File

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ApprovalRegionDO {
public class MDMAreaDO {
@ApiModelProperty("id")
private Integer id;
@@ -16,7 +16,7 @@ public class ApprovalRegionDO {
private String code;
@ApiModelProperty("地区名")
private String regionName;
private String areaName;
@ApiModelProperty("地区父级编号")
private String parentCode;