部门id改为字符串;
This commit is contained in:
+2
-2
@@ -145,7 +145,7 @@ public class UserEntity extends BaseVOEntity {
|
|||||||
private Long shipperId;
|
private Long shipperId;
|
||||||
|
|
||||||
@ApiModelProperty(name = "部门ID")
|
@ApiModelProperty(name = "部门ID")
|
||||||
private Integer departmentId;
|
private String departmentId;
|
||||||
|
|
||||||
@ApiModelProperty
|
@ApiModelProperty
|
||||||
private Boolean hasDefaultAddress;
|
private Boolean hasDefaultAddress;
|
||||||
@@ -192,4 +192,4 @@ public class UserEntity extends BaseVOEntity {
|
|||||||
|
|
||||||
@ApiModelProperty("税号")
|
@ApiModelProperty("税号")
|
||||||
private String taxNumber;
|
private String taxNumber;
|
||||||
}
|
}
|
||||||
+2
-2
@@ -21,7 +21,7 @@ public class UserFactory {
|
|||||||
public UserEntity getUserEntity(UserDO userDO) {
|
public UserEntity getUserEntity(UserDO userDO) {
|
||||||
UserEntity userEntity = new UserEntity();
|
UserEntity userEntity = new UserEntity();
|
||||||
BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO));
|
BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO));
|
||||||
userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?Integer.valueOf(userDO.getDepartmentId()):null);
|
userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?userDO.getDepartmentId():null);
|
||||||
return userEntity;
|
return userEntity;
|
||||||
}
|
}
|
||||||
public CheckDO getCheckDo(UserDO userDO) {
|
public CheckDO getCheckDo(UserDO userDO) {
|
||||||
@@ -30,4 +30,4 @@ public class UserFactory {
|
|||||||
return checkDO;
|
return checkDO;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user