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

whycq

2023-03-09 392aebed0af81c8369a3f07dfdc53cad1b59f6b4

 src/main/java/com/zy/system/controller/PermissionController.java

@@ -61,6 +61,7 @@
            return R.error();
        }
        if (null == permission.getId()){
            permission.setStatus((short) 1);
            permissionService.insert(permission);
        } else {
            permissionService.updateById(permission);
@@ -71,6 +72,7 @@
    @RequestMapping(value = "/permission/add/auth")
    @ManagerAuth
    public R add(Permission permission) {
        permission.setStatus((short) 1);
        permissionService.insert(permission);
        return R.ok();
    }