From 28fe0e05d9f356a8d3ead011ecd56d8a97b22de7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 一月 2024 22:07:22 +0800
Subject: [PATCH] Merge https://gitee.com/wuxw7/MicroCommunity

---
 service-user/src/main/java/com/java110/user/api/RentingApi.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/RentingApi.java b/service-user/src/main/java/com/java110/user/api/RentingApi.java
index 17846ea..9b194d7 100755
--- a/service-user/src/main/java/com/java110/user/api/RentingApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingApi.java
@@ -147,11 +147,15 @@
     public ResponseEntity<String> queryRentingConfig(
             @RequestParam(value = "page") int page,
             @RequestParam(value = "row") int row,
-            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId) {
+            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId,
+            @RequestParam(value = "rentingType",required = false) String rentingType,
+            @RequestParam(value = "rentingFormula",required = false) String rentingFormula) {
         RentingConfigDto rentingConfigDto = new RentingConfigDto();
         rentingConfigDto.setPage(page);
         rentingConfigDto.setRow(row);
         rentingConfigDto.setRentingConfigId(rentingConfigId);
+        rentingConfigDto.setRentingType(rentingType);
+        rentingConfigDto.setRentingFormula(rentingFormula);
         return getRentingConfigBMOImpl.get(rentingConfigDto);
     }
 

--
Gitblit v1.8.0