Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-17 783e768b0d8b2956cf5dd10e44a7347772338232

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -100,6 +100,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -125,6 +126,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }