合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollection.IDeleteFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.IGetFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.ISaveFeeManualCollectionBMO;