From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 9fba596..33c16f9 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -35,6 +35,7 @@
<result column="delivery_address" property="order.deliveryAddress"/>
<result column="project" property="order.project"/>
<result column="customer_name" property="order.customerName"/>
+ <result column="customer_Id" property="order.customerId"/>
</resultMap>
@@ -760,6 +761,7 @@
od.height,
o.project,
o.customer_name,
+ o.customer_Id,
o.delivery_address,
fol.operate_time,
fol.`status`,
--
Gitblit v1.8.0