From 172df444f50622a04a2b9e2cb0d10a4f4c83402a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 16 四月 2024 11:05:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
index ca2d4d0..77df67b 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
@@ -91,21 +91,19 @@
<result column="total_thickness" property="totalThickness"/>
<result column="createTime" property="createTime"/>
- <association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="order_type" property="orderType"/>
- <result column="customer_name" property="customerName"/>
- <result column="project" property="project"/>
- <result column="order_id" property="orderId"/>
- <result column="batch" property="batch"/>
- <result column="b.processing_note" property="processingNote"/>
- <result column="icon" property="icon"/>
- <result column="packType" property="packType"/>
- <result column="salesman" property="salesman"/>
- <result column="delivery_address" property="deliveryAddress"/>
- <result column="creator" property="creator"/>
- <result column="verifier" property="verifier"/>
- <result column="customer_batch" property="customerBatch"/>
- </association>
+ <result column="order_type" property="order.orderType"/>
+ <result column="customer_name" property="order.customerName"/>
+ <result column="project" property="order.project"/>
+ <result column="order_id" property="order.orderId"/>
+ <result column="batch" property="order.batch"/>
+ <result column="b.processing_note" property="order.processingNote"/>
+ <result column="icon" property="order.icon"/>
+ <result column="packType" property="order.packType"/>
+ <result column="salesman" property="order.salesman"/>
+ <result column="delivery_address" property="order.deliveryAddress"/>
+ <result column="creator" property="order.creator"/>
+ <result column="verifier" property="order.verifier"/>
+ <result column="customer_batch" property="order.customerBatch"/>
</resultMap>
--
Gitblit v1.8.0