From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem

---
 archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
index 320656d..b6ed932 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
@@ -4,11 +4,12 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.ArchiveCategory;
 import com.ruoyi.domain.ArchivePlaceName;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 /**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛
+ * 銆愭浠跺湴鍖轰俊鎭�慡ervice鎺ュ彛
  *
  * @author ruoyi
  * @date 2025-08-08
@@ -20,50 +21,52 @@
     AjaxResult selectDataList(ArchivePlaceName archivePlaceName, Integer pageNum, Integer pageSize);
 
     /**
-     * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+     * 鏌ヨ銆愭浠跺湴鍖轰俊鎭��
      *
-     * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
-     * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+     * @param id 銆愭浠跺湴鍖轰俊鎭�戜富閿�
+     * @return 銆愭浠跺湴鍖轰俊鎭��
      */
     public ArchivePlaceName selectArchivePlaceNameById(Long id);
 
     /**
-     * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+     * 鏌ヨ銆愭浠跺湴鍖轰俊鎭�戝垪琛�
      *
-     * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
-     * @return 銆愯濉啓鍔熻兘鍚嶇О銆戦泦鍚�
+     * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
+     * @return 銆愭浠跺湴鍖轰俊鎭�戦泦鍚�
      */
     public List<ArchivePlaceName> selectArchivePlaceNameList(ArchivePlaceName archivePlaceName);
 
     /**
-     * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+     * 鏂板銆愭浠跺湴鍖轰俊鎭��
      *
-     * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
+     * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
      * @return 缁撴灉
      */
     public int insertArchivePlaceName(ArchivePlaceName archivePlaceName);
 
     /**
-     * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+     * 淇敼銆愭浠跺湴鍖轰俊鎭��
      *
-     * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
+     * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
      * @return 缁撴灉
      */
     public int updateArchivePlaceName(ArchivePlaceName archivePlaceName);
 
     /**
-     * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+     * 鎵归噺鍒犻櫎銆愭浠跺湴鍖轰俊鎭��
      *
-     * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿泦鍚�
+     * @param ids 闇�瑕佸垹闄ょ殑銆愭浠跺湴鍖轰俊鎭�戜富閿泦鍚�
      * @return 缁撴灉
      */
     public int deleteArchivePlaceNameByIds(Long[] ids);
 
     /**
-     * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+     * 鍒犻櫎銆愭浠跺湴鍖轰俊鎭�戜俊鎭�
      *
-     * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+     * @param id 銆愭浠跺湴鍖轰俊鎭�戜富閿�
      * @return 缁撴灉
      */
     public int deleteArchivePlaceNameById(Long id);
+
+    public AjaxResult importExcel(MultipartFile file);
 }

--
Gitblit v1.9.1