1、大理片功能初步提交 2、卧理功能优化

zhoushihao

2024-11-20 649e50a1b4fa3811072843c79787163b87ab3889

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

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


}