diff --git a/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java b/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java index 3f2f1a2..c6a7e0d 100644 --- a/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java +++ b/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java @@ -49,8 +49,6 @@ public class UserEntityVo extends UserEntity implements Serializable { private String professionalSchoolName; //个人档案主键 private Integer personalFileId; - //绑定用户ID - private Integer userId; } diff --git a/src/main/resources/mapper/tms/UserDao.xml b/src/main/resources/mapper/tms/UserDao.xml index e1436fb..01a0fbe 100644 --- a/src/main/resources/mapper/tms/UserDao.xml +++ b/src/main/resources/mapper/tms/UserDao.xml @@ -13,13 +13,16 @@ u.phone, u.account, u.countries, + c.cityId, c.cityName, u.dateBirth, u.weChatID, u.IDNumber, u.documentType, u.educationDegree, + pro.provinceId, pro.provinceName, + s.schoolId, s.schoolName FROM hr_user_info u, @@ -40,8 +43,9 @@