From fdc8b22740924b634162bcced4d014846a64c0a6 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期四, 27 二月 2020 13:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java b/WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java
index dc0d464..e810ab5 100644
--- a/WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java
@@ -2,6 +2,7 @@
import com.java110.core.context.IPageData;
import com.java110.web.smo.IFeeServiceSMO;
+import com.java110.web.smo.feeConfig.IListFeeConfigsSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -20,8 +21,11 @@
@Autowired
private IFeeServiceSMO feeServiceSMOImpl;
+ @Autowired
+ private IListFeeConfigsSMO listFeeConfigsSMOImpl;
+
public ResponseEntity<String> loadPropertyConfigData(IPageData pd) {
- return feeServiceSMOImpl.loadPropertyConfigFee(pd, "");
+ return listFeeConfigsSMOImpl.listFeeConfigs(pd);
}
--
Gitblit v1.8.0