Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-27 ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff

 src/main/resources/mapper/content/FeedbackMapper.xml

@@ -32,12 +32,12 @@
        </if>
        <if test="dto.createDateBegin!=null ">
            <![CDATA[
               AND t.create_time >= #{dto.createDateBegin}
               AND f.create_time >= #{dto.createDateBegin}
            ]]>
        </if>
        <if test="dto.createDateEnd!=null ">
            <![CDATA[
               AND t.create_time <= #{dto.createDateEnd}
               AND f.create_time <= #{dto.createDateEnd}
            ]]>
        </if>
        order by f.create_time desc