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

gongzuming

2024-09-09 2a35fbd30e613dcddcbafe8243e40625ce22416a

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

@@ -32,6 +32,9 @@
               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