77

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectResearch.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 项目申请书在研项目情况表VO
@@ -41,10 +42,10 @@ public class ComProjectResearch extends BaseEntity {
     private String leader;
     /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data startDate;
+    private Date startDate;
     /** 起止年限（结束） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data endDate;
+    private Date endDate;
     /** 项目经费 */
     @ApiModelProperty(value = "项目经费", position = 7 )
     private BigDecimal funds;

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectResearchQueryVO.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 查询项目申请书在研项目情况表VO
@@ -41,10 +42,10 @@ public class ComProjectResearchQueryVO extends PaginationVO{
     private String leader;
     /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data startDate;
+    private Date startDate;
     /** 起止年限（结束） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data endDate;
+    private Date endDate;
     /** 项目经费 */
     @ApiModelProperty(value = "项目经费", position = 7 )
     private BigDecimal funds;