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

wangfei

2024-09-03 e6a25dfa55101ca8b684eea2ae447e6e5c1e59d7

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

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


}