From f0c673877d2dd1bdeea0e1ddb6a7222c9e012f95 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 17 八月 2023 09:32:39 +0800
Subject: [PATCH] Merge commit 'd044dc871c16f05c9a1fb1489621020c91ec9d59'

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

diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
index ef5771d..63e0adb 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
@@ -22,7 +22,7 @@
     private Integer rootDepartId;
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date stateDate;
+    private Date startDate;
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;

--
Gitblit v1.9.3