wangfei
2024-12-12 a78a9decb428762bcf6cc82641abbc5d6257008e
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -145,6 +145,9 @@
     * 是否合并
     */
    private Integer combine;
    /**
     * 打标属性
     */
    private String markIcon;
}