Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityDTO.java

@@ -20,8 +20,8 @@ import java.util.Date;
 @NoArgsConstructor
 public class ActivityDTO extends PageParam {
 
-     private Date startTime;
-     private Date endTime;
+     private Long startTime;
+     private Long endTime;
      private Integer goodsType;
 
 }