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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 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>