From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 2b3c36d..54dfd06 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -41,6 +41,8 @@
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDetailVO;
import org.springblade.modules.property.vo.PropertyCompanyVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.property.vo.PropertyDistrictInfo;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserDept;
@@ -207,7 +209,8 @@
public PropertyCompanyDetailVO getPayConfig(PropertyCompanyVO propertyCompany) {
- PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+// PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+ PropertyCompanyDetailVO detail = baseMapper.getDetailVO(propertyCompany);
AliPayInfo pA = new AliPayInfo();
@@ -239,4 +242,9 @@
}
return null;
}
+
+ @Override
+ public PropertyDistrictInfo getPropertyDistrictInfo(PropertyDistrictInfo propertyDistrictInfo) {
+ return baseMapper.getPropertyDistrictInfo(propertyDistrictInfo);
+ }
}
--
Gitblit v1.9.3