代码合并--新增英文翻译切换按钮

zhoushihao

2024-10-15 110ff41b225e47b736fea112c83955a107ead905

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

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


}