From 525dae0dec6ba6afbe6bf81b82eb99d69aeb05b5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 15:57:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
index bb665c6..697f643 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
@@ -151,9 +151,10 @@
private Boolean hasExpire;
@ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
@ExcelColumn(name="璁″垝鏃ユ湡",index = 4,width =15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date workPlanPlanDate;
- @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃ユ湡")
- @ExcelColumn(name="璁″垝鏃ユ湡",index = 3,width =15)
+ @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date workPlanStartDate;
@@ -180,10 +181,6 @@
@ExcelColumn(name="閿�鍞鍗�")
private String salesOrder;
-
-// @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
-// @JsonFormat(pattern = "yyyy-MM-dd")
-// private Date workPlanStartDate;
@ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3