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

xuxueyang

2024-09-18 38d8abee8db1034b4cc3fae8613e8328653a1080

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

@@ -35,14 +35,14 @@
        <if test="dto.userId!= null and dto.userId != ''">
            and t.user_id = #{dto.userId}
        </if>
        <if test="dto.recordDateStart!=null ">
        <if test="dto.recordDateStart!=null and dto.recordDateStart!='' ">
            <![CDATA[
               AND t.record_date >= #{dto.createDateBegin}
               AND t.record_date >= #{dto.recordDateStart}
            ]]>
        </if>
        <if test="dto.recordDateEnd!=null ">
        <if test="dto.recordDateEnd!=null and dto.recordDateEnd!='' ">
            <![CDATA[
               AND t.record_date <= #{dto.createDateEnd}
               AND t.record_date <= #{dto.recordDateEnd}
            ]]>
        </if>
        <if test="dto.type!=null and dto.type != null">