diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index d099e073..07b0f405 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "12.服务端安装、端口设置"
             }
+          },
+          {
+            "id": "e70d3a2c15e5ce59",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -94,13 +109,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "SanPinPLM/相关操作/0.SETOUT/12.服务端安装、端口设置.md",
+                "file": "conflict-files-obsidian-git.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "12.服务端安装、端口设置 的大纲"
+              "title": "conflict-files-obsidian-git 的大纲"
             }
           },
           {
@@ -163,7 +178,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 418.5
+    "width": 484.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -176,11 +191,12 @@
       "hidden-folder-obsidian:显示文件夹": false
     }
   },
-  "active": "27878581586f2143",
+  "active": "e70d3a2c15e5ce59",
   "lastOpenFiles": [
+    "SanPinPLM/相关操作/0.SETOUT/12.服务端安装、端口设置.md",
+    "conflict-files-obsidian-git.md",
     "SanPinPLM/相关操作/0.SETOUT/10.数据库安装.md",
     "SanPinPLM/数据库/数据库.md",
-    "conflict-files-obsidian-git.md",
     "SanPinPLM/简略教程/外邮通知教程.md",
     "SanPinPLM/相关操作/3.PLM/15.项目模板配置.md",
     "SanPinPLM/相关操作/3.PLM/assets/Pasted image 20250228153221.png",
@@ -199,7 +215,6 @@
     "SanPinPLM/相关操作/2.PDM/59.把零部件放入标准物料库.md",
     "SanPinPLM/相关操作/2.PDM/30.图号、物料编码唯一性设置.md",
     "SanPinPLM/相关操作/4.other/200.Delphi脚本.md",
-    "SanPinPLM/相关操作/0.SETOUT/12.服务端安装、端口设置.md",
     "SanPinPLM/相关操作/0.SETOUT/15.服务端升级.md",
     "SanPinPLM/相关操作/0.SETOUT/20.浏览器安装、调试.md",
     "SanPinPLM/相关操作/2.PDM/13.CAXA接口安装、属性映射.md",