From 1337e62c126ddb7eb1088c4d81a721cf7cc2d7c4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 七月 2025 17:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java
index e6f60d0..8d773f1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java
@@ -18,4 +18,7 @@
     private String isDaySpan;
     private String equipmentName;
 //    private String equipmentId;
+
+    private String overtimeStartTime;
+    private String overtimeEndTime;
 }

--
Gitblit v1.9.3