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

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

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