Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

1 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

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

@@ -277,6 +277,9 @@
                    if (userCoupon.getStatus() == 2) {
                        packageResp.setUseStatus(2);
                    }
                    if (userCoupon.getStatus() == 3) {
                        packageResp.setUseStatus(3);
                    }
                    respList.add(packageResp);
                }
                if (null != req.getCouponType()) {