中空接口及样式调整

wangfei

2024-12-05 7d691c873261fc73ea412f20f42eb12560d6ca7b

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

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


}