From 74d2e2158ca037e30f414886056b5ac65d690ae6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 06 七月 2025 10:28:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index 83678dc..7fbb747 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -250,7 +250,7 @@
select
d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id,
- d.processing_note
+ d.processing_note,d.contract_id
from sd.`order` d
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
--
Gitblit v1.8.0