From 653d67ef574c8ef1a64605f517f329eb6e6aec12 Mon Sep 17 00:00:00 2001 From: lxp <1928192722@qq.com> Date: 星期六, 15 三月 2025 17:00:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOutputWorkingHoursDto.java | 4 ++++ 1 files changed, 4 insertions(+), 0 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 acee277..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 @@ -17,4 +17,8 @@ // 鐘舵�� 宸叉彁浜� 宸插鏍� 宸叉壒鍑� private String state; + + private String dateTime1; + + private String dateTime2; } -- Gitblit v1.9.3