Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-05 e350ed7ffc3a57387186c602d99443d6f936d549

 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java

@@ -4,7 +4,7 @@
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
import com.dsh.activity.service.CouponService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@
    private UserCouponService uconService;

    @Autowired
    private CouponService cService;
    private ICouponService cService;

    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");