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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

@@ -32,14 +32,14 @@
        </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 t.create_time desc
        order by f.create_time desc
    </select>
</mapper>