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

java110

2021-08-26 cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d

 java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml

@@ -47,6 +47,12 @@
        <if test="collectionId !=null and collectionId != ''">
            and t.collection_id= #{collectionId}
        </if>
        <if test="collectionIds !=null ">
            and t.collection_id in
            <foreach collection="collectionIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        order by t.collection_year
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}