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

陶杰

2024-09-27 ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff

 src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java

@@ -489,6 +489,12 @@
    }

    @Override
    public boolean expireActivityCouponTemplateAll() {

        return couponTemplateMapperCustom.expireActivityCouponTemplateAll()>0;
    }

    @Override
    public List<CouponTemplateVO> getActivityEffectList(QueryActivityEffectCouponDTO dto) {

        return couponTemplateMapperCustom.getActivityEffectList(dto);