Merge remote-tracking branch 'gitbit/bfasrs6' into bfasrs6

tqs

2023-05-26 e28026a099829f9e5c7b7b98405c7006c6343942

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