Merge remote-tracking branch 'origin/master'

wangfei

2024-12-23 250e2cd3c6b63605d2d23d496884ff18fac5e536

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

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


}