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

TQS

2023-03-14 29d91b9ec32a8fff36c60938c4d87f7ee5495497

 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();
    }