Merge branch 'dev_grid_patrol' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java

@@ -77,7 +77,7 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
     /**
      * 事件时间
      */
-	private String projectCreateTime;
+	private Date projectCreateTime;
 
 	/**
 	 * 上报人ID
@@ -144,4 +144,5 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
      */
 	private String allParentIds;
 
+
 }