|
|
@@ -23,7 +23,7 @@ public class ProjectTaskListOut extends ProjectTask {
|
|
|
*/
|
|
|
@Excel(name = "项目年份",dateFormat = "yyyy")
|
|
|
@JsonFormat(pattern = "yyyy")
|
|
|
- private Object projectYear;
|
|
|
+ private String projectYear;
|
|
|
|
|
|
/**
|
|
|
* 0=非跨年,1=跨年
|
|
|
@@ -60,7 +60,7 @@ public class ProjectTaskListOut extends ProjectTask {
|
|
|
*/
|
|
|
@Excel(name = "创建年份",dateFormat = "yyyy")
|
|
|
@JsonFormat(pattern = "yyyy")
|
|
|
- private Object createYear;
|
|
|
+ private String createYear;
|
|
|
|
|
|
/**
|
|
|
* 创建时间
|
|
|
@@ -129,15 +129,7 @@ public class ProjectTaskListOut extends ProjectTask {
|
|
|
this.id = id;
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public Object getProjectYear() {
|
|
|
- return projectYear;
|
|
|
- }
|
|
|
|
|
|
- @Override
|
|
|
- public void setProjectYear(Object projectYear) {
|
|
|
- this.projectYear = projectYear;
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
public Integer getCrossYear() {
|
|
|
@@ -189,15 +181,7 @@ public class ProjectTaskListOut extends ProjectTask {
|
|
|
this.projectStatus = projectStatus;
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public Object getCreateYear() {
|
|
|
- return createYear;
|
|
|
- }
|
|
|
|
|
|
- @Override
|
|
|
- public void setCreateYear(Object createYear) {
|
|
|
- this.createYear = createYear;
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
public Date getCreateTime() {
|