From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
index 997a4f3..402c72e 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
@@ -122,6 +122,7 @@
     public ResponseEntity<String> queryFeeDiscount(@RequestParam(value = "communityId") String communityId,
                                                    @RequestParam(value = "discountType", required = false) String discountType,
                                                    @RequestParam(value = "discountName", required = false) String discountName,
+                                                   @RequestParam(value = "discountId", required = false) String discountId,
                                                    @RequestParam(value = "ruleName", required = false) String ruleName,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
@@ -132,6 +133,7 @@
         feeDiscountDto.setDiscountType(discountType);
         feeDiscountDto.setDiscountName(discountName);
         feeDiscountDto.setRuleName(ruleName);
+        feeDiscountDto.setDiscountId(discountId);
         return getFeeDiscountBMOImpl.get(feeDiscountDto);
     }
 

--
Gitblit v1.8.0