Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-10-19 8738b8e0f7cfa65732bfc0e40fa80e1ca3c7e27e

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

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


}