Merge remote-tracking branch 'origin/master'

zhoushihao

2025-02-26 a8c1dd008f9a096cb01774f17a8bceda5aafed88

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

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


}