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

java110

2021-06-01 b497ff41e47f4ebe69b86f13f6972f34f33f4884

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

old mode 100644
new mode 100755
@@ -74,9 +74,7 @@
            , t.received_amount= #{receivedAmount}
        </if>

        <if test="collectionId !=null and collectionId != ''">
            , t.collection_id= #{collectionId}
        </if>

        where 1=1
        <if test="detailId !=null and detailId != ''">
            and t.detail_id= #{detailId}
@@ -84,6 +82,9 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="collectionId !=null and collectionId != ''">
            and t.collection_id= #{collectionId}
        </if>

    </update>