Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wu

2024-12-10 3c10f26f0675baeda3cf6c244b3f9fa290cce027

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

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

    private Integer combine;
    /**
     * 预排格子
     */
    private Integer Slot;
    /**
     * 打标属性
     */
    private String markIcon;

}