Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

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