Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-05-17 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e

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

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

    /**
     * 宽