From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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