Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-13 ddf7bfc1a172d3ad52f9ae0a728e91d405f2dd49

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

@@ -34,7 +34,7 @@
    /**
     * 流程卡玻璃类型
     */
    private Integer glassType;
    private String glassType;

    /**
     * 宽