Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-24 2b036eac4814793a71eda6e4d3946cb8202cf961

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

@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;


}