Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-04 498557d0fd3b2bc14b446626cbc8a63a52fa83cb

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

@@ -34,8 +34,9 @@
        <result column="status" property="status" />
        <result column="point" property="point" />
        <result column="member_id" property="memberId" />

    </resultMap>


    <update id="activeBatchCouponTemplate">
        update t_coupon_template set status='active',update_by=#{param.updateBy},update_time=now() where id in
        <foreach collection="param.idList" item="item" open="(" separator="," close=")">