Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

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

@@ -43,17 +43,14 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
	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() {
		return orgCode;
@@ -108,33 +105,6 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
		this.type = type;
	}
	@Column(name = "manager", length = 50)
	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;
	}
    @Column(name = "organization_code")
    public String getOrganizationCode() {
        return organizationCode;
@@ -188,9 +158,6 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    public void setSaasModuleList(List<SaasModuleDO> saasModuleList) {
        this.saasModuleList = saasModuleList;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "audit_failed_reason")
    public String getAuditFailedReason() {
@@ -209,4 +176,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

@@ -35,6 +35,12 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	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/")
@@ -48,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;
@@ -180,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;