From aa3bd3741b94f50f0c1d7e3a137bb681d7421294 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 三月 2025 09:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 5d3fedf..339754e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2938,7 +2938,7 @@
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                  AS glassNumber,
                od.order_number,
                ogd.child_width as width,
-               ogd.child_height as height,
+               ogd.child_height as height
         from sd.order_glass_detail as ogd
                  left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
                  left join sd.`order` as o on o.order_id = ogd.order_id

--
Gitblit v1.8.0