From 2ca41e3710bacc49e36d109b47aeea093b9be332 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 05 九月 2024 16:09:13 +0800
Subject: [PATCH] 更改合并字段命名避免触发关键字

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 0c6ae56..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
@@ -141,6 +141,10 @@
      * 鐜荤拑ID
      */
     private String glassId;
+    /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer combine;
 
 
 }

--
Gitblit v1.8.0