From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index fc90837..b801321 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -83,6 +83,14 @@
}
/**
+ * 物业公司列表查询（不分页）
+ */
+ @GetMapping("/getPropertyCompanyList")
+ public R getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPropertyCompanyList(propertyCompany));
+ }
+
+ /**
* 物业公司 新增
*/
@PostMapping("/save")
@@ -119,7 +127,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyService.removeByIds(Func.toLongList(ids)));
+ return R.status(propertyCompanyService.removeByIds(Func.toIntList(ids)));
}
--
Gitblit v1.9.3