承运商接口：goodsowner的字典表类型统一为Integer

src/main/java/com/esv/freight/customer/module/goodsowner/GoodsOwnerConstants.java

@@ -14,14 +14,14 @@ public class GoodsOwnerConstants {
     /**
      * 货主类型：1-个人、2-企业
      **/
-    public static final String OWNER_TYPE_PERSONAL = "1";
-    public static final String OWNER_TYPE_COMPANY = "2";
+    public static final Integer OWNER_TYPE_PERSONAL = 1;
+    public static final Integer OWNER_TYPE_COMPANY = 2;
 
     /**
      * 货主帐号创建来源：1-平台创建、2-自行注册
      **/
-    public static final String OWNER_SOURCE_TYPE_PLATFORM = "1";
-    public static final String OWNER_SOURCE_TYPE_REGISTER = "2";
+    public static final Integer OWNER_SOURCE_TYPE_PLATFORM = 1;
+    public static final Integer OWNER_SOURCE_TYPE_REGISTER = 2;
 
     /**
      * 货主帐号审核状态：0-待审核、1-审核成功，2-审核失败，APP自行注册需要平台审核
@@ -33,13 +33,13 @@ public class GoodsOwnerConstants {
     /**
      * 货主帐号状态：1-正常、2-停用
      **/
-    public static final String OWNER_ACCOUNT_STATUS_UNBLOCK = "1";
-    public static final String OWNER_ACCOUNT_STATUS_BLOCK = "2";
+    public static final Integer OWNER_ACCOUNT_STATUS_UNBLOCK = 1;
+    public static final Integer OWNER_ACCOUNT_STATUS_BLOCK = 2;
 
     /**
      * 是否同为收货地址：0-不是、1-是
      **/
-    public static final String ADDRESS_COPY_NO = "0";
-    public static final String ADDRESS_COPY_YES = "1";
+    public static final Integer ADDRESS_COPY_NO = 0;
+    public static final Integer ADDRESS_COPY_YES = 1;
 
 }

src/main/java/com/esv/freight/customer/module/goodsowner/dto/AccountInfoDto.java

@@ -43,11 +43,11 @@ public class AccountInfoDto {
     /**
      * 创建来源：1-平台创建、2-自行注册
      */
-    private String sourceType;
+    private Integer sourceType;
     /**
      * 帐号状态：1-正常、2-停用
      */
-    private String accountStatus;
+    private Integer accountStatus;
     /**
      * 货主帐号审核状态：0-待审核、1-审核成功，2-审核失败，APP自行注册需要平台审核
      */
@@ -80,7 +80,7 @@ public class AccountInfoDto {
     /**
      * 货主类型：1-个人、2-企业
      */
-    private String ownerType;
+    private Integer ownerType;
     /**
      * 客户编码
      */

src/main/java/com/esv/freight/customer/module/goodsowner/entity/AccountEntity.java

@@ -51,11 +51,11 @@ public class AccountEntity implements Serializable {
 	/**
 	 * 创建来源：1-平台创建、2-自行注册
 	 */
-	private String sourceType;
+	private Integer sourceType;
 	/**
 	 * 帐号状态：1-正常、2-停用
 	 */
-	private String accountStatus;
+	private Integer accountStatus;
 	/**
 	 * 货主帐号审核状态：0-待审核、1-审核成功，2-审核失败，APP自行注册需要平台审核
 	 */

src/main/java/com/esv/freight/customer/module/goodsowner/entity/InfoEntity.java

@@ -31,7 +31,7 @@ public class InfoEntity implements Serializable {
 	/**
 	 * 货主类型：1-个人、2-企业
 	 */
-	private String ownerType;
+	private Integer ownerType;
 	/**
 	 * 客户编码
 	 */

src/main/java/com/esv/freight/customer/module/goodsowner/form/AccountInfoForm.java

@@ -6,10 +6,10 @@ import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 
 /**
  * @description:
@@ -41,9 +41,9 @@ public class AccountInfoForm {
     /**
      * 货主类型：1-个人、2-企业
      */
-    @Pattern(regexp = "[12]", message = "参数ownerType不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
-    @NotBlank(message = "参数ownerType不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class})
-    private String ownerType;
+    @Range(min = 1, max = 2, message = "参数ownerType不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
+    @NotNull(message = "参数ownerType不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class})
+    private Integer ownerType;
     /**
      * 客户名称
      */

src/main/java/com/esv/freight/customer/module/goodsowner/form/AccountQueryForm.java

@@ -8,7 +8,6 @@ import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 
 /**
  * @description:
@@ -25,8 +24,8 @@ public class AccountQueryForm {
     /**
      * 货主类型：1-个人、2-企业
      */
-    @Pattern(regexp = "[12]", message = "参数ownerType不合法", groups = {ValidatorList.class})
-    private String ownerType;
+    @Range(min = 1, max = 2, message = "参数ownerType不合法", groups = {ValidatorList.class})
+    private Integer ownerType;
     /**
      * 货主编码
      */
@@ -35,12 +34,12 @@ public class AccountQueryForm {
     /**
      * 货主帐号审核状态(字典表)：0-待审核、1-审核成功，2-审核失败
      */
-    @Pattern(regexp = "[012]", message = "参数auditStatus不合法", groups = {ValidatorList.class})
-    private String auditStatus;
+    @Range(min = 0, max = 2, message = "参数auditStatus不合法", groups = {ValidatorList.class})
+    private Integer auditStatus;
     /**
      * 帐号状态：1-正常、2-停用
      */
-    @Pattern(regexp = "[12]", message = "参数accountStatus不合法", groups = {ValidatorList.class})
+    @Range(min = 1, max = 2, message = "参数accountStatus不合法", groups = {ValidatorList.class})
     private String accountStatus;
     /**
      * （个人或企业联系人手机号）帐号

src/main/java/com/esv/freight/customer/module/goodsowner/vo/AccountInfoVO.java

@@ -29,11 +29,11 @@ public class AccountInfoVO implements Serializable {
 	/**
 	 * 创建来源：1-平台创建、2-自行注册
 	 */
-	private String sourceType;
+	private Integer sourceType;
 	/**
 	 * 帐号状态：1-正常、2-停用
 	 */
-	private String accountStatus;
+	private Integer accountStatus;
 	/**
 	 * 货主帐号审核状态：0-待审核、1-审核成功，2-审核失败，APP自行注册需要平台审核
 	 */
@@ -41,7 +41,7 @@ public class AccountInfoVO implements Serializable {
 	/**
 	 * 货主类型：1-个人、2-企业
 	 */
-	private String ownerType;
+	private Integer ownerType;
 	/**
 	 * 客户编码
 	 */

src/main/java/com/esv/freight/customer/module/goodsowner/vo/AccountListVO.java

@@ -25,7 +25,7 @@ public class AccountListVO implements Serializable {
 	/**
 	 * 创建来源：1-平台创建、2-自行注册
 	 */
-	private String sourceType;
+	private Integer sourceType;
 	/**
 	 * 货主名称（企业时为全称、个人时为联系人姓名）
 	 */
@@ -37,7 +37,7 @@ public class AccountListVO implements Serializable {
 	/**
 	 * 货主类型：1-个人、2-企业
 	 */
-	private String ownerType;
+	private Integer ownerType;
 	/**
 	 * 登录帐号，货主手机号
 	 */
@@ -45,7 +45,7 @@ public class AccountListVO implements Serializable {
 	/**
 	 * 帐号状态：1-正常、2-停用
 	 */
-	private String accountStatus;
+	private Integer accountStatus;
 	/**
 	 *
 	 */