Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -2,6 +2,8 @@

import lombok.Data;

import java.util.List;

/**
 * @author: LiuS
 * @create: 2023-08-02 13:50
@@ -23,10 +25,6 @@
     */
    private String equipmentId;
    /**
     * 设备名称
     */
    private String equipmentName;
    /**
     * 树类型    ->  1:车间层级   2:部门层级
     */
    private String typeTree;
@@ -38,5 +36,13 @@
     * 时间段
     */
    private String endTime;
    /**
     * 层级ID
     */
    private String parentId;
    /**
     * 设备ids
     */
    private List<String> equipmentIdList;

}