Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-10 24bc065e9009bfb3c778e762921268a389aeaf49

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

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

    private Integer combine;
    /**
     * 打标属性
     */
    private String markIcon;

}