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

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

 src/main/resources/mapper/point/CustomerPointMapper.xml

@@ -45,12 +45,22 @@
               AND t.record_date <= #{dto.recordDateEnd}
            ]]>
        </if>
        <if test="dto.type!=null and dto.type != null">
        <if test="dto.type!=null and dto.type != ''">
            and t.type = #{dto.type}
        </if>
        <if test="dto.remarks!=null and dto.remarks != null">
            and t.remarks like CONCAT('%',#{dto.remarks},'%')
        </if>
        <if test="dto.createTimeStart!=null">
            <![CDATA[
               AND t.create_time >= #{dto.createTimeStart}
            ]]>
        </if>
        <if test="dto.createTimeEnd!=null ">
            <![CDATA[
               AND t.create_time <= #{dto.createTimeEnd}
            ]]>
        </if>
        order by t.create_time desc
    </select>
</mapper>