瀏覽代碼

Merge remote-tracking branch 'origin/feat_20250514_wangshuo' into feat_20250514_wangshuo

wangshuo 1 月之前
父節點
當前提交
0a14875616

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRepoController.java

@@ -94,7 +94,6 @@ public class SysRepoController extends BaseController
                 return error("新旧文件类型不一致,请重试");
             }
             return toAjax(sysRepoService.insertSysRepoAndSysRepoHistory(sysRepo_new,sysRepoHistory));
-
         }
     }
 

+ 2 - 1
ruoyi-common/src/main/java/com/ruoyi/common/filecompare/SpireDoc.java

@@ -5,13 +5,14 @@ import com.spire.doc.fields.TextRange;
 import com.spire.ms.System.Collections.Generic.List;
 
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class SpireDoc {
     public static Set<String> compare(String file1, String file2) {
         Document doc1 = new Document();
         Document doc2 = new Document();
-        Set<String> set = new HashSet<String>();
+        Set<String> set = new LinkedHashSet<>();
         try {
             doc1.loadFromFile(file1);
             doc2.loadFromFile(file2);