From 7fa7302550e8dfba383634e4f13161e451667fe6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 Jan 2024 17:10:48 +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 7e53cf4..7df6cee 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,13 @@
return R.data(propertyCompanyService.getDetail(propertyCompany));
}
-
+ /**
+ * 物业公司 商户配置
+ * @return
+ */
+ @GetMapping("/getPayConfig")
+ @ApiOperation(value = "商户配置")
+ public R getPayConfig(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPayConfig(propertyCompany));
+ }
}
--
Gitblit v1.9.3