From 03df078310b88f2b4472c07ed9a09278b425ee00 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 七月 2024 17:28:34 +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 6079a46..1191627 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -246,7 +246,7 @@
                p.total_thickness     AS 'totalThickness',
                p.thickness,
                od.weight,
-               od.weight,
+               od.remarks,
                ods.S01,
                ods.S02,
                ods.S03,

--
Gitblit v1.8.0