From 492f1870ad3f79064f5d1a00cef4ad985cd0f8cf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 四月 2024 10:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

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

diff --git a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml b/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
index 6ed4567..7c1cd65 100644
--- a/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml
@@ -128,7 +128,8 @@
                od.width,
                od.height,
                od.shape,
-               dd.responsible_process as patchProcesses,
+               dd.responsible_process as responsibleProcess,
+               rw.this_process as patchProcesses,
                dd.breakage_quantity-dd.quantity as breakageQuantity,
                dd.return_process as patchProcesses,
                dd.breakage_reason as patchReason,

--
Gitblit v1.8.0