Merge remote-tracking branch 'origin/master'

zhoushihao

2025-11-06 b21caa5499c50384f3a3a5dd795a7a0ad197d36f

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

@@ -158,5 +158,10 @@
     * 打标属性
     */
    private String markIcon;
    /**
     * 除膜方式
     */
    private Integer filmRemove;


}