From d0e27ecff97fff5fabed2696c9813c8e17ac6322 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 Nov 2023 17:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
index a2f6bd4..064dbc5 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
@@ -46,7 +46,7 @@
 @AllArgsConstructor
 @RequestMapping("blade-propertyCapitalApply/propertyCapitalApply")
 @Api(value = "物业维修资金申请表", tags = "物业维修资金申请表接口")
-public class PropertyCapitalApplyController extends BladeController {
+public class PropertyCapitalApplyController{
 
 	private final IPropertyCapitalApplyService propertyCapitalApplyService;
 
@@ -119,7 +119,7 @@
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(propertyCapitalApplyService.deleteLogic(Func.toLongList(ids)));
+		return R.status(propertyCapitalApplyService.removeByIds(Func.toLongList(ids)));
 	}
 
 

--
Gitblit v1.9.3