From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeCollectionDetailApi.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionDetailApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionDetailApi.java
index 3fa3446..c27d3d9 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionDetailApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionDetailApi.java
@@ -1,12 +1,12 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.feeCollectionDetail.FeeCollectionDetailDto;
+import com.java110.dto.fee.FeeCollectionDetailDto;
import com.java110.fee.bmo.feeCollectionDetail.IDeleteFeeCollectionDetailBMO;
import com.java110.fee.bmo.feeCollectionDetail.IGetFeeCollectionDetailBMO;
import com.java110.fee.bmo.feeCollectionDetail.ISaveFeeCollectionDetailBMO;
import com.java110.fee.bmo.feeCollectionDetail.IUpdateFeeCollectionDetailBMO;
-import com.java110.po.feeCollectionDetail.FeeCollectionDetailPo;
+import com.java110.po.fee.FeeCollectionDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,10 +97,10 @@
*/
@RequestMapping(value = "/queryFeeCollectionDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeCollectionDetail(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "orderId") String orderId,
- @RequestParam(value = "ownerName") String ownerName,
- @RequestParam(value = "payerObjName") String payerObjName,
- @RequestParam(value = "collectionWay") String collectionWay,
+ @RequestParam(value = "orderId",required = false) String orderId,
+ @RequestParam(value = "ownerName",required = false) String ownerName,
+ @RequestParam(value = "payerObjName",required = false) String payerObjName,
+ @RequestParam(value = "collectionWay",required = false) String collectionWay,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeCollectionDetailDto feeCollectionDetailDto = new FeeCollectionDetailDto();
--
Gitblit v1.8.0