Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-04 63100c0391d3a4f1d41ac5e580625913b2edd265

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

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


}