From 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期六, 11 五月 2024 08:34:24 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/target/classes/mapper/sd/ProductMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml b/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml
index 3212ae3..c1956ba 100644
--- a/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/target/classes/mapper/sd/ProductMapper.xml
@@ -17,7 +17,7 @@
         <result column="update_time" property="updateTime"/>
         <!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
         <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
-            <result column="type_id" property="typeID"/>
+            <result column="type_id" property="typeId"/>
             <result column="type_name" property="typeName"/>
         </association>
 

--
Gitblit v1.8.0