大理片调度逻辑修改，进出片改为升序，调度逻辑修改

ZengTao

2024-12-03 d219290089df8c9acd2e84ab0f135fc42e3b682d

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

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


}