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

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DataAuthController.java

@@ -89,7 +89,7 @@ public class DataAuthController {
 	@Operation(summary = "新增/编辑数据权限配置")
 	@SysLog("系统管理-数据权限-新增/编辑数据权限配置")
 	@PostMapping("/saveOrUpdate")
-	//@PreAuthorize("@pms.hasPermission('sys_data_auth_add')")
+	@PreAuthorize("@pms.hasPermission('sys_permission_add')")
 	public R<String> saveOrUpdate(@RequestBody SysDataAuthVO sysDataAuthVO) {
 		return sysDataAuthService.saveDataAuth(sysDataAuthVO);
 	}
@@ -103,7 +103,7 @@ public class DataAuthController {
 	@Operation(summary = "删除数据权限配置")
 	@SysLog("系统管理-数据权限-删除数据权限配置")
 	@DeleteMapping("/{id:\\d+}")
-	@PreAuthorize("@pms.hasPermission('sys_data_auth_del')")
+	@PreAuthorize("@pms.hasPermission('sys_permission_del')")
 	public R<Boolean> removeById(@PathVariable String id) {
 		return R.ok(sysDataAuthService.removeDataAuthById(id));
 	}