Merge remote-tracking branch 'remotes/origin/develop'

cuijian

2023-08-19 bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22

 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;
}