From 6fb742d463ecac5e7d4934d7248a40979edc3626 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 21 七月 2025 14:33:25 +0800 Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns --- 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