From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java
index 82917be..812e916 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessOrderService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.process.dto.ProcessOrderDto;
import com.ruoyi.process.pojo.ProcessOrder;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@@ -21,6 +22,8 @@
IPage<ProcessOrderDto> pageProcessOrder(Page page, ProcessOrderDto processOrderDto);
+ void uploadFile(MultipartFile file, Integer id);
+
ProcessOrderDto getProcessOrder(Integer id);
int doProcessOrder(ProcessOrder processOrder);
--
Gitblit v1.9.3