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/impl/ProcessOrderServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
index 007ac3d..51bac39 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
@@ -12,8 +12,8 @@
 import com.ruoyi.common.core.domain.entity.User;
 import com.ruoyi.common.utils.QueryWrappers;
 import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.XWPFDocumentUtils;
 import com.ruoyi.process.dto.InspectionOrderDetail;
 import com.ruoyi.process.dto.InspectionOrderExportDto;
 import com.ruoyi.process.dto.ProcessOrderDto;

--
Gitblit v1.9.3