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