Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-21 e0786b57f356db59efc6a4a3dd5e23908775286a

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java

@@ -106,6 +106,9 @@


            for (Coupon coupon : userId) {
                if (coupon.getDistributionMethod()!=2){
                    continue;
                }
                CouponListVo couponListVo = new CouponListVo();
                couponListVo.setId(coupon.getId().longValue());
                couponListVo.setName(coupon.getName());