Merge branch 'master' into Bulbasaur

2021-05-13 15:07:34 +08:00
parent a10c38f3c1 1bfa2f82bd
commit a6b2b955e8
18 changed files with 718 additions and 169 deletions
--- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
@@ -142,7 +142,7 @@ public class AdminUserManagerController {
    public ResultMessage<Object> register(AdminUserDTO adminUser,
                                          @RequestParam(required = false) List<String> roles) {
        try {
-            if (roles != null & roles.size() >= 10) {
+            if (roles != null && roles.size() >= 10) {
                return ResultUtil.error(ResultCode.PERMISSION_BEYOND_TEN);
            }
            adminUserService.saveAdminUser(adminUser, roles);