版本整合03

zhoushihao

2024-10-16 7956f09935a708f17b0f1b29a6625475f53c7509

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

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


}