Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-04 498557d0fd3b2bc14b446626cbc8a63a52fa83cb

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

@@ -25,7 +25,6 @@
        <result column="coupon_name" property="couponName" />

        <result column="point" property="point" />
        <result column="order_no" property="orderNo" />

    </resultMap>