From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 8f3c4bc..3b72cd2 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -71,7 +71,12 @@
@ExcelColumn(name="璁″垝鏃ユ湡",index = 3,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
-
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@@ -147,4 +152,7 @@
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
private List<PlansExtListVO> plansExtListVOList;
+
+ @ApiModelProperty(value = "鏄惁杩囨湡")
+ private Boolean hasExpire;
}
--
Gitblit v1.9.3