From b9743f23027d141042041e2600a0da78cd3d4928 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 十月 2024 16:58:47 +0800
Subject: [PATCH] 新增英文翻译切换按钮
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index d7d5958..0266265 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -106,7 +106,7 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
+ private Integer combine;
/**
* 鏃嬭浆瑙掑害
*/
--
Gitblit v1.8.0