From b3cb0f942ff70be8b9f7ef0d6ff0b0ce2c52c25b Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 17 五月 2024 19:31:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 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 dfa7b6e..f1fa50d 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
@@ -34,7 +34,7 @@
     /**
      * 娴佺▼鍗＄幓鐠冪被鍨�
      */
-    private Integer glassType;
+    private String glassType;
 
     /**
      * 瀹�

--
Gitblit v1.8.0