Merge

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -20,14 +20,14 @@ import java.util.List;
public class SaasDO extends UuidIdentityEntityWithOperator {
    public enum Status {
        //待审核
    	//待审核
        auditWait,
        //审核通过
		//审核通过
        auditPassed,
        //审核不通过
		//审核不通过
        auditNotPassed,
        //已删除
        delete
		//已删除
		delete
    }
    private String orgCode; //机构编码
@@ -36,20 +36,21 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private Integer type; //类型
	private String manager; //管理员 - 关联user表id字段
	private String email; //管理员邮箱
	private String mobile; //管理员手机号码
	private String organizationCode; //组织机构代码
	private String businessLicense; //营业执照url
	private String systemName; //系统名称
	private String areaNumber; //行政区划代码
    List<BaseOrgDO> orgList;
    List<SaasModuleDO> saasModuleList;
    private String manager; //管理员 - 关联user表id字段
    private String email; //管理员邮箱
    private String mobile; //管理员手机号码
    //审核不通过的原因
    private String auditFailedReason;
    //管理员姓名
    private String managerName;
    //机构
    List<BaseOrgDO> orgList;
    //业务模块
    List<SaasModuleDO> saasModuleList;
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
@@ -60,16 +61,16 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
		this.orgCode = orgCode;
	}
    @Column(name = "name", nullable = false, length = 200)
    public String getName() {
        return this.name;
    }
	@Column(name = "name", nullable = false, length = 200)
	public String getName() {
		return this.name;
	}
    public void setName(String name) {
        this.name = name;
    }
	public void setName(String name) {
		this.name = name;
	}
    @Column(name = "status", nullable = false)
	@Column(name = "status", nullable = false)
    public Status getStatus() {
        return status;
    }
@@ -79,57 +80,30 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "remark")
    public String getRemark() {
        return this.remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "logo")
    public String getLogo() {
        return logo;
    }
    public void setLogo(String logo) {
        this.logo = logo;
    }
    @Column(name = "type", nullable = false)
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Column(name = "manager", length = 50)
    public String getManager() {
        return manager;
    }
	public String getRemark() {
		return this.remark;
	}
    public void setManager(String manager) {
        this.manager = manager;
    }
	public void setRemark(String remark) {
		this.remark = remark;
	}
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
	@Column(name = "logo")
	public String getLogo() {
		return logo;
	}
    public void setEmail(String email) {
        this.email = email;
    }
	public void setLogo(String logo) {
		this.logo = logo;
	}
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
	@Column(name = "type", nullable = false)
	public Integer getType() {
		return type;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	public void setType(Integer type) {
		this.type = type;
	}
    @Column(name = "organization_code")
@@ -203,4 +177,31 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
    @Column(name = "manager")
    public String getManager() {
        return manager;
    }
    public void setManager(String manager) {
        this.manager = manager;
    }
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasVO.java

@@ -29,6 +29,18 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	private String logo;
	@ApiModelProperty(value = "类型（租户类型编码，从1开始自增）", example = "1")
    private Integer type;
	@ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
	private String manager;
	@ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
	private String email;
	@ApiModelProperty(value = "管理员手机号码", example = "18888888888")
	private String mobile;
	@ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
	private String auditFailedReason;
	@ApiModelProperty(value = "租户类型名称", example = "家医型")
	private String typeName;
	@ApiModelProperty(value = "管理员姓名", example = "张三")
	private String managerName;
	@ApiModelProperty(value = "组织机构代码", example = "46542")
	private String organizationCode;
	@ApiModelProperty(value = "营业执照url", example = "../img/")
@@ -42,18 +54,7 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	List<BaseOrgVO> orgList;
	@ApiModelProperty(value = "业务模块", example = "业务模块")
	List<SaasModuleVO> saasModuleList;
    @ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
    private String manager;
    @ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
    private String email;
    @ApiModelProperty(value = "管理员手机号码", example = "18888888888")
    private String mobile;
    @ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
    private String auditFailedReason;
    @ApiModelProperty(value = "租户类型名称", example = "家医型")
    private String typeName;
    @ApiModelProperty(value = "管理员姓名", example = "张三")
    private String managerName;
	public String getOrgCode() {
		return orgCode;
@@ -123,6 +124,9 @@ public class SaasVO extends UuidIdentityVOWithOperator {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	public String getOrganizationCode() {
		return organizationCode;
@@ -171,9 +175,6 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	public void setSaasModuleList(List<SaasModuleVO> saasModuleVOList) {
		this.saasModuleList = saasModuleList;
	}
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getAuditFailedReason() {
        return auditFailedReason;