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

ZengTao

2024-09-24 7c7c8b1fb4dd63bbc25130b32d507aee5c130d90

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

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


}