From b949123acd810812781c1dc15843a44fb974073f Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 03 二月 2020 14:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java b/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
index eaf4a2a..4e52e3d 100644
--- a/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
+++ b/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
@@ -55,10 +55,9 @@
         paramIn.put("row", page * row);
 
         String apiUrl = "";
-        if (!paramIn.containsKey("feeTypeCd") || FeeTypeConstant.FEE_TYPE_PROPERTY.equals(paramIn.getString("feeTypeCd"))) {
+        if (!paramIn.containsKey("payObjType") || "3333".equals(paramIn.getString("payObjType"))) {
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
-        } else if (FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(paramIn.getString("feeTypeCd"))) {
-            paramIn.put("feeTypeCd", "");
+        } else if ("6666".equals(paramIn.getString("payObjType"))) {
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
         }else{
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);

--
Gitblit v1.8.0