diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index 74eb70c1..65e4e469 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
     "collapse-filter": false,
     "search": "",
     "showTags": false,
@@ -45,4 +46,48 @@
     "linkDistance": 250,
     "scale": 0.3865410244547755,
     "close": true
+=======
+  "collapse-filter": false,
+  "search": "",
+  "showTags": false,
+  "showAttachments": false,
+  "hideUnresolved": false,
+  "showOrphans": true,
+  "collapse-color-groups": false,
+  "colorGroups": [
+    {
+      "query": "path:SanPinPLM  ",
+      "color": {
+        "a": 1,
+        "rgb": 14048348
+      }
+    },
+    {
+      "query": "path:外发客户教程  ",
+      "color": {
+        "a": 1,
+        "rgb": 14069084
+      }
+    },
+    {
+      "query": "path:设计软件使用  ",
+      "color": {
+        "a": 1,
+        "rgb": 11392604
+      }
+    }
+  ],
+  "collapse-display": false,
+  "showArrow": false,
+  "textFadeMultiplier": 0,
+  "nodeSizeMultiplier": 1,
+  "lineSizeMultiplier": 1,
+  "collapse-forces": false,
+  "centerStrength": 0.518713248970312,
+  "repelStrength": 10,
+  "linkStrength": 1,
+  "linkDistance": 250,
+  "scale": 0.3865410244547755,
+  "close": true
+>>>>>>> origin/main
 }
\ No newline at end of file
diff --git a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md
index 7f3e7407..3781b1d3 100644
--- a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md
+++ b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md
@@ -8,7 +8,7 @@
 
 打开`WPS`软件，在 **任务管理器** 中查看它的进程位数
 
-如果进程后带有 `(32位)` 的信息，代表所安装的`WPS Office`软件是32位的，否则说明是64位的
+如果进程后带有 `(32位)` 的信息，代表所安装的 `WPS Office` 软件是32位的，否则说明是64位的
 
 ![](assets/Pasted%20image%2020250429142402.png)