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

无关风月

7 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -364,7 +364,7 @@
        }
        String ticketJson = grantCoupon.getTicketJson();
        if (StringUtils.hasLength(ticketJson)) {
            // 赠送优惠券
            // 赠送门票
            JSONArray objects = JSON.parseArray(ticketJson);
            for (Object object : objects) {
                JSONObject jsonObject = (JSONObject) object;