From 7fdf35a2364c8482c5056a1c932e1501518f943b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:17:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
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