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/ImportFeeApi.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
index 482af59..a5eb935 100755
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -1,15 +1,15 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFee.ImportFeeDetailDto;
+import com.java110.dto.importData.ImportFeeDto;
+import com.java110.dto.importData.ImportFeeDetailDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.ISaveImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IUpdateImportFeeDetailBMO;
-import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -108,7 +108,8 @@
@RequestParam(value = "floorNum", required = false) String floorNum,
@RequestParam(value = "unitNum", required = false) String unitNum,
@RequestParam(value = "roomNum", required = false) String roomNum,
- @RequestParam(value = "importFeeId") String importFeeId) {
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "importFeeId", required = false) String importFeeId) {
ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
importFeeDetailDto.setPage(page);
importFeeDetailDto.setRow(row);
@@ -117,6 +118,7 @@
importFeeDetailDto.setFloorNum(floorNum);
importFeeDetailDto.setUnitNum(unitNum);
importFeeDetailDto.setRoomNum(roomNum);
+ importFeeDetailDto.setFeeId(feeId);
return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
}
--
Gitblit v1.8.0