zhoushihao
2024-09-05 249b52982b719a5ad555bc060b36157fd2b8d6a3
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -141,6 +141,10 @@
     * 玻璃ID
     */
    private String glassId;
    /**
     * 是否合并
     */
    private Integer merge;
}