From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
index 8ccf68d..21cac48 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java
@@ -23,4 +23,11 @@
@ApiModelProperty("缁撴潫鏃堕棿")
private String endDate;
+
+
+ @ApiModelProperty("杈呭姪宸ユ椂寮�濮嬫椂闂�")
+ private String assistBeginDate;
+
+ @ApiModelProperty("杈呭姪宸ユ椂缁撴潫鏃堕棿")
+ private String assistEndDate;
}
--
Gitblit v1.9.3