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

TQS

2022-12-03 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3

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