From 1c84565d624ad0cce0576a22d0323cf3181d49cd Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 十月 2023 13:56:28 +0800 Subject: [PATCH] Merge branch 'dev' --- server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java index 2526f21..1f25463 100644 --- a/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java +++ b/server/src/main/java/doumeemes/dao/ext/dto/WorkPlansSaveDTO.java @@ -1,5 +1,6 @@ package doumeemes.dao.ext.dto; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,4 +41,11 @@ @ApiModelProperty(value = "浼樺厛绾�") private Integer urgent; + @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + @ApiModelProperty(value = "閿�鍞崟鍙�" ) + private String salesorder; + } -- Gitblit v1.9.3