Merge branch 'dev-wyf-1.5' into container-test

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

@@ -1749,6 +1749,9 @@ public class DataUtils {
 
             if (!CollectionUtils.isEmpty(ticketTimeList)) {
                 for (KylinTicketTimesVo timesVo : ticketTimeList) {
+                    if (timesVo.getType().equals(2)) {
+                        continue;
+                    }
                     // 获取当前场次关联的艺人，按sort降序
                     List<KylinArtistPerformanceDao> artists = artistPerformanceMapper.selectArtistsByPerformanceAndTimes(performancesId, timesVo.getTicketTimesId());