From 9d80c05bdbc18b4d7778828d411deb9b603f6a4b Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 25 七月 2025 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java
index 07e11a9..103116f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicGlassType.java
@@ -10,7 +10,7 @@
     private Integer id;
     private Integer level;
     private String belong;
-    private String typeID;
+    private String typeId;
     private String typeName;
     private String createTime;
 

--
Gitblit v1.8.0