Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

6 天以前 8f37a2de432a8d4d77f94dcf45d0b86ce3006ee2

 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;