From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index f8aac4c..f74f4f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -13,7 +13,7 @@
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.*;
-import com.smartor.service.IPatArchiveService;
+import com.ruoyi.patarchive.service.IPatArchiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -32,6 +32,10 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.patarchive.domain.PatArchiveOthreInfo;
+import com.ruoyi.patarchive.domain.PatArchiveReq;
+import com.ruoyi.patarchive.domain.PatArchiveVO;
+import com.ruoyi.patarchive.domain.PatUpInfoVO;
 
 /**
  * 鎮h�呮。妗圕ontroller

--
Gitblit v1.9.3