From 36448db2aa831d62d3c7354128f250cede7470c3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 17:48:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 4 +++-
1 files changed, 3 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 3a81b32..3b72cd2 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -76,7 +76,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞崟鍙�" )
- @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@@ -153,4 +152,7 @@
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
private List<PlansExtListVO> plansExtListVOList;
+
+ @ApiModelProperty(value = "鏄惁杩囨湡")
+ private Boolean hasExpire;
}
--
Gitblit v1.9.3