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

ZengTao

2024-10-24 22fb46f2db1714a6b450b353669d26908884653f

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

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


}