From aed64ecf84f628253c8cc6008e3804f6f2237a5b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:20:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 43b3c62..3778507 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -44,12 +44,12 @@
<result column="total_thickness" property="totalThickness"/>
<result column="thickness" property="thickness"/>
</association>
-
+
<!--<result column="g_typeId" property="glassTypes.typeId"/>
<result column="g_type" property="glassTypes.type"/>-->
-
+
</resultMap>
-
+
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select
--
Gitblit v1.8.0