Browse Source

用户企业规模更换数据类型,更改后台相关数据类型

anderx 7 years ago
parent
commit
8e9cfdb399

+ 3 - 3
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -254,7 +254,7 @@ public class OrganizationIdentity {
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_identity.enterprise_scale
 	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
-	private Integer enterpriseScale;
+	private String enterpriseScale;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_identity.register_type
 	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
@@ -1233,7 +1233,7 @@ public class OrganizationIdentity {
 	 * @return  the value of organization_identity.enterprise_scale
 	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
@@ -1242,7 +1242,7 @@ public class OrganizationIdentity {
 	 * @param enterpriseScale  the value for organization_identity.enterprise_scale
 	 * @mbg.generated  Wed Jun 06 10:26:09 CST 2018
 	 */
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java

@@ -136,7 +136,7 @@ public class InputOrgBasicInfo {
 	 */
 	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		enterpriseScale;
+	private String		enterpriseScale;
 
 	/**
 	 * 注册类型
@@ -403,11 +403,11 @@ public class InputOrgBasicInfo {
 		this.industry = industry;
 	}
 
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
 

+ 4 - 4
src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

@@ -109,7 +109,7 @@ public class OrgBasicInfoBo {
 	/**
 	 * 企业规模(注册资金)
 	 */
-	private Integer		enterpriseScale;
+	private String		enterpriseScale;
 
 	/**
 	 * 注册类型
@@ -355,12 +355,12 @@ public class OrgBasicInfoBo {
 		this.industry = industry;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
-	public Integer getEnterpriseScale() {
+	
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}