From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 3a0542c..d9e4ff4 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -16,6 +16,8 @@
select ppm.*,
pwo.work_order_no as workOrderNo,
pwo.status as workOrderStatus,
+ pwo.actual_start_time as actualStartTime,
+ pwo.actual_end_time as actualEndTime,
u.nick_name as nickName
from
production_product_main ppm
--
Gitblit v1.9.3