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

wu

2024-10-09 3e82c2c5fcb1095266ba9a92d4a7c564c988aa97

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

@@ -141,6 +141,10 @@
     * 玻璃ID
     */
    private String glassId;
    /**
     * 是否合并
     */
    private Integer combine;


}