Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-02 a663689bd78df6f772074feebe02fd66198e23ea

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

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


}