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

无关风月

昨天 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java

@@ -153,9 +153,9 @@
            }
            vip.setCouponList(couponVipRespList);
            String ticketJson = vip.getTicketJson();
            if(ticketJson!=null){
            JSONArray ticketJsonArray = JSONArray.parseArray(ticketJson);
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

            for (Object o : ticketJsonArray) {
                JSONObject ticketJsonObject = (JSONObject) o;
                TicketVipResp ticketVipResp = new TicketVipResp();
@@ -170,6 +170,7 @@
                ticketVipResp.setEffectiveTime(simpleDateFormat.format(date));
                ticketVipRespList.add(ticketVipResp);
            }
            }
            vip.setTicketList(ticketVipRespList);
        }
        return list;