Merge remote-tracking branch 'origin/master'

zengh

2022-02-22 b4a26dbdfbb5d8c12ae1e0fc14f998aebbf05af4

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -547,6 +547,7 @@
            throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
        }
        user.setRoleId("1372092102682521602");
        user.setDeptId("1424615972718895106");
        user.setId(null);
        //用户新增
        boolean status = userService.save(user);