From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/production/ProductionProductMainMapper.xml |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index d9e4ff4..3a0542c 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -16,8 +16,6 @@
         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