Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

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<List<SysUser>> 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

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java

@@ -139,8 +139,10 @@ public class CanteenCategoryController {
     @Operation(summary = "通过id查询", description = "通过id查询")
     @GetMapping("/getAllSimple")
     @PreAuthorize("@pms.hasPermission('canteen_canteenCategory_view')")
-    public R getAllSimple(@RequestParam(value = "categoryType", required = false) String categoryType) {
+    public R getAllSimple(@RequestParam(value = "categoryType", required = false) String categoryType,
+    @RequestParam(value = "name", required = false) String name) {
         LambdaQueryWrapper<CanteenCategoryEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.like(StringUtils.isNotBlank(name), CanteenCategoryEntity::getName, name);
         wrapper.orderByAsc(CanteenCategoryEntity::getSort);
         wrapper.apply(StringUtils.isNotEmpty(categoryType), "FIND_IN_SET({0}, your_column_name)", categoryType);
         List<CanteenCategoryEntity> list = canteenCategoryService.listScope(wrapper);

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;
 
     /**