Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 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>