From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 7e53cf4..d19c399 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -178,5 +178,24 @@
return R.data(propertyCompanyService.getDetail(propertyCompany));
}
+ /**
+ * 物业公司 商户配置
+ * @return
+ */
+ @GetMapping("/getPayConfig")
+ @ApiOperation(value = "商户配置")
+ public R getPayConfig(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPayConfig(propertyCompany));
+ }
+ /**
+ * 物业公司 自定义详情查询
+ * @return
+ */
+ @GetMapping("/getDetailByDeptId")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "通过用户id查询物业详情", notes = "传入propertyCompany")
+ public R<PropertyCompanyDetailVO> getDetailByUserId() {
+ return R.data(propertyCompanyService.getDetailByDeptId());
+ }
}
--
Gitblit v1.9.3