From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index f3c61ee..8b9a0f2 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -549,6 +549,7 @@
<select id="exportOrderReport" >
SELECT
*,
+ b.processing_note as processingNotes,
a.create_time as createTime,
d.type_name as level_one,
e.type_name as level_two
@@ -941,7 +942,7 @@
b.delivery_address,
b.other_money,
b.other_money_remarks,
- b.processing_note,
+ b.processing_note as processingNotes,
b.other_remarks,
b.area,
b.quantity,
--
Gitblit v1.8.0