From a5a12dfed331c5d2508e1acee474c9d6dc35b774 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 18 十一月 2024 08:26:12 +0800
Subject: [PATCH] 义乌新增掰片/识别、卧式缓存、磨边（冷加工）页面 前端路由配置等

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 6ef464d..f7feafb 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -144,7 +144,7 @@
     /**
      * 鏄惁鍚堝苟
      */
-    private Integer merge;
+    private Integer combine;
 
 
 }

--
Gitblit v1.8.0