From 2f894921e5cf74910805f08a5e3180b68ac09e18 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 四月 2024 15:50:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/target/classes/mapper/sd/OrderMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
index 6af7965..363a41e 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
@@ -37,7 +37,8 @@
             o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
             o.quantity = od.b,
             o.area = od.c,
-            o.perimeter= od.aa
+            o.perimeter= od.aa,
+            o.other_money = ifnull(c.money,0)
         where
             o.order_id = #{orderId}
 

--
Gitblit v1.8.0