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

陶杰

2024-11-14 d94e7d6bbf23698c27147a60ee866c64b2d43775

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

@@ -29,9 +29,12 @@
        WHERE p.deleted= 0
        <if test="lastYear!=null ">
            <![CDATA[
               p.record_date <= #{lastYear}
               and p.record_date <= #{lastYear}
            ]]>
        </if>
        <if test="userId!=null and userId!=''">
            and p.user_id = #{userId}
        </if>
        GROUP BY
        p.user_id,
        p.customer_id