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

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

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

@@ -51,6 +51,16 @@
        <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>