From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
index 42144b3..de011ef 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
@@ -1,8 +1,8 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.pojo.ProductionOrderRouting;
-import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import java.util.List;
@@ -10,5 +10,5 @@
ProductionOrderRouting listMain(Long orderId);
- List<ProductionOrderRoutingOperation> listItem(Long orderId);
+ List<ProductionOrderRoutingOperationVo> listItem(Long orderId);
}
--
Gitblit v1.9.3