From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
index 9810b6e..841dd10 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
@@ -27,5 +27,4 @@
     List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);
 
     ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);
-
 }

--
Gitblit v1.9.3