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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml

@@ -118,6 +118,11 @@
        <if test="param.couponId != null and param.couponId != ''">
            and t.coupon_id =  #{param.couponId}
        </if>
        <if test="param.category != null and param.category != ''">
            and t.category =  #{param.category}
        </if>



        order by t.create_time desc
    </sql>