|
@@ -60,13 +60,13 @@ public class ProjectTask implements Serializable {
|
|
|
* 项目年份
|
|
* 项目年份
|
|
|
*/
|
|
*/
|
|
|
@JsonFormat(pattern = "yyyy")
|
|
@JsonFormat(pattern = "yyyy")
|
|
|
- private Date projectYear;
|
|
|
|
|
|
|
+ private Object projectYear;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 创建年份
|
|
* 创建年份
|
|
|
*/
|
|
*/
|
|
|
@JsonFormat(pattern = "yyyy")
|
|
@JsonFormat(pattern = "yyyy")
|
|
|
- private Date createYear;
|
|
|
|
|
|
|
+ private Object createYear;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 0=非跨年,1=跨年
|
|
* 0=非跨年,1=跨年
|
|
@@ -147,19 +147,19 @@ public class ProjectTask implements Serializable {
|
|
|
this.projectNumber = projectNumber;
|
|
this.projectNumber = projectNumber;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public Date getProjectYear() {
|
|
|
|
|
|
|
+ public Object getProjectYear() {
|
|
|
return projectYear;
|
|
return projectYear;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public void setProjectYear(Date projectYear) {
|
|
|
|
|
|
|
+ public void setProjectYear(Object projectYear) {
|
|
|
this.projectYear = projectYear;
|
|
this.projectYear = projectYear;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public Date getCreateYear() {
|
|
|
|
|
|
|
+ public Object getCreateYear() {
|
|
|
return createYear;
|
|
return createYear;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public void setCreateYear(Date createYear) {
|
|
|
|
|
|
|
+ public void setCreateYear(Object createYear) {
|
|
|
this.createYear = createYear;
|
|
this.createYear = createYear;
|
|
|
}
|
|
}
|
|
|
|
|
|