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

gongzuming

2024-09-12 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a

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

@@ -32,7 +32,7 @@
        <result column="usage_time_num" property="usageTimeNum" />
        <result column="status" property="status" />

        <result column="vip_grade" property="vipGrade" />
        <result column="member_id" property="memberId" />


    </resultMap>