From 91b92422716cb4c5d0433f77fd2d6d45a69639c4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 15 八月 2023 18:35:17 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 43c59ef..a9387d4 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
@@ -147,6 +147,12 @@
private Integer distributNoDoneNum;
@ApiModelProperty(value = "搴撳瓨鏄惁婊¤冻 0涓嶆弧瓒� 1婊¤冻", example = "0")
private Integer isStock;
+ @ApiModelProperty(value = "鏄惁寤舵湡")
+ private Boolean hasExpire;
+ @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
+ private Date workPlanPlanDate;
+ @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃ユ湡")
+ private Date workPlanStartDate;
@ExcelColumn(name="鐗╂枡鍚嶇О",index = 1,width =15)
@@ -173,9 +179,9 @@
@ExcelColumn(name="閿�鍞鍗�")
private String salesOrder;
- @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date workPlanStartDate;
+// @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+// private Date workPlanStartDate;
@ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3