From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 6f92c36..9b332f2 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -82,6 +82,7 @@
         <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
 
             <result column="building_number" property="buildingNumber"/>
+            <result column="product_id" property="productId"/>
             <result column="product_name" property="productName"/>
             <result column="width" property="width"/>
             <result column="height" property="height"/>
@@ -100,6 +101,7 @@
             a.order_id,
             a.order_number,
             b.building_number,
+            b.product_id,
             b.product_name,
             a.glass_address,
            a.technology_number,

--
Gitblit v1.8.0