Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-07-11 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22

 service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java

old mode 100644
new mode 100755
@@ -1,10 +1,10 @@
package com.java110.report.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.reportFeeYearCollection.ReportFeeYearCollectionDto;
import com.java110.dto.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailDto;
import com.java110.po.reportFeeYearCollection.ReportFeeYearCollectionPo;
import com.java110.po.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailPo;
import com.java110.dto.reportFee.ReportFeeYearCollectionDto;
import com.java110.dto.reportFee.ReportFeeYearCollectionDetailDto;
import com.java110.po.reportFee.ReportFeeYearCollectionPo;
import com.java110.po.reportFee.ReportFeeYearCollectionDetailPo;
import com.java110.report.bmo.reportFeeYearCollection.IDeleteReportFeeYearCollectionBMO;
import com.java110.report.bmo.reportFeeYearCollection.IGetReportFeeYearCollectionBMO;
import com.java110.report.bmo.reportFeeYearCollection.ISaveReportFeeYearCollectionBMO;
@@ -116,9 +116,10 @@
     */
    @RequestMapping(value = "/queryReportFeeYear", method = RequestMethod.GET)
    public ResponseEntity<String> queryReportFeeYear(@RequestParam(value = "communityId") String communityId,
                                                     @RequestParam(value = "objType") String objType,
                                                     @RequestParam(value = "objName",required = false) String objName,
                                                     @RequestParam(value = "configId",required = false) String configId,
                                                     @RequestParam(value = "objType", required = false) String objType,
                                                     @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
                                                     @RequestParam(value = "objName", required = false) String objName,
                                                     @RequestParam(value = "configId", required = false) String configId,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) {
        ReportFeeYearCollectionDto reportFeeYearCollectionDto = new ReportFeeYearCollectionDto();
@@ -128,9 +129,11 @@
        reportFeeYearCollectionDto.setObjType(objType);
        reportFeeYearCollectionDto.setObjName(objName);
        reportFeeYearCollectionDto.setConfigId(configId);
        reportFeeYearCollectionDto.setFeeTypeCd(feeTypeCd);
        return getReportFeeYearCollectionBMOImpl.get(reportFeeYearCollectionDto);
    }


    /**
     * 微信保存消息模板
     *