Merge branch 'develop' into release_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java

@@ -56,13 +56,13 @@ public class MemoConcernEntity extends BaseEpmetEntity {
     /**
      * 预计关怀时间
      */
-	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
+	@TableField(value="SCHEDULED_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
     /**
      * 实际执行时间(预留字段)
      */
-	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
+	@TableField(value="ACTUAL_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date actualTime;
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java

@@ -46,7 +46,7 @@ public class MemoDifficultyEntity extends BaseEpmetEntity {
     /**
      * 预计处理时间
      */
-	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
+	@TableField(value="SCHEDULED_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
 }