From 0eb8b0635a2e50ff1f82bbea890804e73aae59af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 10:51:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
index 65687e6..7a2e907 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
@@ -441,8 +441,8 @@
     private String mixParam;
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startDate;
+    private String planDateStartDate;
     @ApiModelProperty(value = "鎴鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endDate;
+    private String planDateEndDate;
 }

--
Gitblit v1.9.3