diff --git a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java index 00b78b76b..04ee43189 100644 --- a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java +++ b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java @@ -188,7 +188,7 @@ public class AppUserAutoLoginController { R> userByMobile=remoteUserService.getUserByMobile(mobile); SysUser sysUser = userByMobile.getData().get(0); -// int i=8/0; + int i=8/0; UserTokenDTO userTokenDTO = new UserTokenDTO(); userTokenDTO.setSysUser(sysUser); //登录成功,根据新注册的用户信息返回token diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java index 9ff35928c..56b9695fa 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java @@ -18,13 +18,17 @@ public class UserExcelFaceVo { /** * 账号登录名没有就用手机号 */ - @ExcelProperty("用户名称") + @ExcelProperty("用户名") private String username; + + @ExcelProperty("昵称") + private String nickname; + /** * 用户真实姓名 */ - @ExcelProperty("用户昵称") + @ExcelProperty("姓名") private String name; /** @@ -36,7 +40,7 @@ public class UserExcelFaceVo { /** * 手机号码 */ - @ExcelProperty("手机号码") + @ExcelProperty("手机号") private String mobile; /**