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

陶杰

2024-09-19 263a13a155ec759b1cb26cc00edd640f4d2e747c

 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>