Merge branch 'dev' into test

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ResponseDto.java

@@ -15,7 +15,6 @@ public class ResponseDto<T> implements Serializable, Cloneable {
     private static final long serialVersionUID = 8377276776600901982L;
     private String code;
     private String message;
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private T data;
 
     public boolean isSuccess() {

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

@@ -127,7 +127,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String threeDaysLaterStr = sdf.format(beforeDayEnd);
         for (KylinPerformanceVo info : performancesList) {
-            String timeStart = info.getTimeStart();
+            String timeStart = info.getSellTime();
             if (-1 != DateUtil.compareStrDay(timeStart, nowTimeTStr) && -1 == DateUtil.compareStrDay(timeStart, toDayEndTimeStr)) {
                 toDayList.add(info);
             }