From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java
old mode 100644
new mode 100755
index 00ac09e..e1fa455
--- a/service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PrestoreFeeApi.java
@@ -100,20 +100,20 @@
*/
@RequestMapping(value = "/queryPrestoreFee", method = RequestMethod.GET)
public ResponseEntity<String> queryPrestoreFee(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "prestoreFeeAmount", required = false) String prestoreFeeAmount,
- @RequestParam(value = "prestoreFeeType", required = false) String prestoreFeeType,
- @RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "page") int page,
+ @RequestParam(value = "state" ,required = false) String state,
+ @RequestParam(value = "roomId" ,required = false) String roomId,
+ @RequestParam(value = "prestoreFeeType" ,required = false) String prestoreFeeType,
+ @RequestParam(value = "prestoreFeeAmount" ,required = false) String prestoreFeeAmount,
@RequestParam(value = "row") int row) {
PrestoreFeeDto prestoreFeeDto = new PrestoreFeeDto();
prestoreFeeDto.setPage(page);
prestoreFeeDto.setRow(row);
- prestoreFeeDto.setRoomId(roomId);
- prestoreFeeDto.setCommunityId(communityId);
- prestoreFeeDto.setPrestoreFeeAmount(prestoreFeeType);
- prestoreFeeDto.setPrestoreFeeAmount(prestoreFeeAmount);
prestoreFeeDto.setState(state);
+ prestoreFeeDto.setRoomId(roomId);
+ prestoreFeeDto.setPrestoreFeeType(prestoreFeeType);
+ prestoreFeeDto.setPrestoreFeeAmount(prestoreFeeAmount);
+ prestoreFeeDto.setCommunityId(communityId);
return getPrestoreFeeBMOImpl.get(prestoreFeeDto);
}
}
--
Gitblit v1.8.0