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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

 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