From 47424dbf004a3d4f2fcf6ca4123eb8c86d1ecda7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 09:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/pp/Report.xml | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
index e984782..3778507 100644
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ b/north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -63,11 +63,7 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-<<<<<<< HEAD
-
-=======
->>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
from
flow_card as c
left join
@@ -100,14 +96,8 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
-<<<<<<< HEAD
-
- where a.order_id = #{orderId}
-
-=======
where a.order_id = #{orderId}
->>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0