Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-17 edade5a0933d5abf784e8a86785bb5d0b9c5a8ac

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -102,6 +102,7 @@
        String username = principal.getName();
        UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
        Map<String, Object> data = new HashMap<>();
        data.put("userId", umsAdmin.getId());
        data.put("username", umsAdmin.getUsername());
        data.put("menus", roleService.getMenuList(umsAdmin.getId()));
        data.put("icon", umsAdmin.getIcon());