Merge remote-tracking branch 'remotes/origin/dev_1.0.0' into release_1.0.0

src/main/java/cn/com/qmth/mps/service/impl/UserServiceImpl.java

@@ -358,6 +358,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 		vo.setEnable(ue.getEnable());
 		vo.setId(ue.getId());
 		vo.setRoleId(ue.getRoleId());
+		vo.setRole(Role.getById(ue.getRoleId()));
 		vo.setLoginName(ue.getLoginName());
 		vo.setName(ue.getName());
 		vo.setSchoolId(ue.getSchoolId());