From b42aecb23d3b2baa52fd7474282dfc1018fd066e Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 14:56:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
index 813341b..581f044 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansDTO.java
@@ -29,7 +29,7 @@
@ApiModelProperty(value = "璁″垝鏃ユ湡 缁撴潫", example = "1")
private String planDateEnd;
- @ApiModelProperty(value = "璁″垝鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
+ @ApiModelProperty(value = "璁″垝鐘舵�� 0宸茬敓鎴愩��1宸插彂甯�(鎵ц涓級銆�2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
private Integer planStatus;
@ApiModelProperty(value = "宸ュ巶涓婚敭", example = "1")
@@ -47,4 +47,13 @@
@ApiModelProperty(value = "鎴愬搧璁″垝涓婚敭", hidden = true)
private Integer workPlanId;
+ @ApiModelProperty(value = "閿�鍞崟鍙�")
+ private String salesorder;
+
+ @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂� 寮�濮�" )
+ private String startDateStart;
+
+ @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂� 缁撴潫")
+ private String startDateEnd;
+
}
--
Gitblit v1.9.3