Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -114,7 +114,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         // 组合数据
         info.put("total", count);
-        info.put("data", list);
+        info.put("list", list);
 
         return info;
     }
@@ -175,6 +175,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 PerformanceVo.class,
                 PerformanceVo.class.getSimpleName()
         );
+        String roadShowId = performancesInfo.getRoadShowId();
+//        if (roadShowId)
+
 
         List<TicketTimesPartnerVo> ticketTimesPartnerVo = mongoTemplate.find(
                 Query.query(Criteria.where("performancesId").is(performancesId)),