修改调度bug，调整界面理片笼数据顺序

ZengTao

2024-12-05 1b7f3aae56880b102b275629dbb76d4c81510d9a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java

@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;


}