Merge remote-tracking branch 'origin/master'

Lius

2024-04-16 44df47f684ec9e4ac1c26b89465a9d179b322b02

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDeviceCalendarVo.java

@@ -17,5 +17,8 @@
    private String sleepEndDate;
    private String isDaySpan;
    private String equipmentName;
    private String equipmentId;
//    private String equipmentId;

    private String overtimeStartTime;
    private String overtimeEndTime;
}