From 52d79c7e5a1fb4316f34886ec336f69f56d5edb2 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:48:46 +0800
Subject: [PATCH] 工时管理日工时管理以及辅助工时配置

---
 performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java
index 0b5699a..af5d75e 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java
@@ -11,9 +11,14 @@
 public class AuxiliaryOutputWorkingHoursDto extends AuxiliaryOutputWorkingHours {
 
     @ApiModelProperty("妫�娴嬩汉")
-    @ExcelProperty(index = 1, value = "妫�娴嬩汉")
+    @ExcelProperty(value = "妫�娴嬩汉")
     private String name;
 
-    @ApiModelProperty("鐢电紗鏍囪瘑")
-    private String cableTag;
+
+    // 鐘舵�� 宸叉彁浜� 宸插鏍� 宸叉壒鍑�
+    private String state;
+
+    private String dateTime1;
+
+    private String dateTime2;
 }

--
Gitblit v1.9.3