Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-23 38b5da7912ca6ab2bb2bb001cd55803bbb849d29

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

@@ -113,6 +113,7 @@
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            map.put("moreDepartmentIds", user.getMoreDepartmentIds());

            return ResultData.success(map);
        }
@@ -148,6 +149,7 @@
            map.put("userType", user.getUserType());
            map.put("departmentId", user.getDepartmentId());
            map.put("departmentName", user.getDepartmentName());
            map.put("moreDepartmentIds", user.getMoreDepartmentIds());

            return ResultData.success(map);
        }
@@ -306,8 +308,6 @@
        {
            return error("账户不能为空");
        }

        config.setUserType("3");

        config.setUpdateBy(sys.getUserId()+"");