From f9cd4d608ad48254a538c3ef3320cff89375cf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=A4=A9=E6=B5=A9?= <th.zhao@hydro-tech.cn>
Date: Thu, 14 May 2026 15:37:21 +0800
Subject: [PATCH] vault backup: 2026-05-14 15:37:21

---
 .gitignore                       |  2 ++
 .obsidian/community-plugins.json |  8 ++++++++
 .obsidian/workspace.json         | 23 +++++++++++------------
 部门五月份任务规划.md            |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..450da1f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+/.obsidian/community-plugins.json
\ No newline at end of file
diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json
index e4494a1..b6d8c6f 100644
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -2,9 +2,17 @@
   "export-graph-view",
   "mermaid-tools",
   "obsidian-git",
+<<<<<<< HEAD
   "obsidian-plantuml",
   "pdf-plus",
   "obsidian-tasks-plugin",
   "tasks-calendar-wrapper",
   "advanced-canvas"
+=======
+  "obsidian-tasks-plugin",
+  "pdf-plus",
+  "tasks-calendar-wrapper",
+  "advanced-canvas",
+  "obsidian-plantuml"
+>>>>>>> origin/main
 ]
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index a339da7..100cc22 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -11,14 +11,14 @@
             "id": "b0ba3684f585064f",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "split-diff-view",
               "state": {
-                "file": "README.md",
-                "mode": "source",
-                "source": false
+                "aFile": ".obsidian/community-plugins.json",
+                "bFile": ".obsidian/community-plugins.json",
+                "aRef": ""
               },
-              "icon": "lucide-file",
-              "title": "README"
+              "icon": "diff",
+              "title": "Diff: community-plugins.json  (Working Tree)"
             }
           }
         ]
@@ -156,13 +156,12 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "README.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "README 的大纲"
+              "title": "大纲"
             }
           },
           {
@@ -209,13 +208,13 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "b0ba3684f585064f",
+  "active": "2076822cdefbb8a3",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "README.md",
     "未命名.canvas",
     "诀别书钢琴谱.pdf",
     "动画.gif",
-    "README.md",
-    "部门五月份任务规划.md",
-    "conflict-files-obsidian-git.md"
+    "部门五月份任务规划.md"
   ]
 }
\ No newline at end of file
diff --git a/部门五月份任务规划.md b/部门五月份任务规划.md
index f1adbf6..69d7560 100644
--- a/部门五月份任务规划.md
+++ b/部门五月份任务规划.md
@@ -65,7 +65,7 @@
 
 #### 交付物
 
-- [x] 原型机硬件问题清单 ✅ 2026-05-09
+- [x] 原型机硬件问题清单 ✅ 2026-05-10
 - [ ] 新版原理图修改需求清单
 - [ ] 新版原理图 V1
 - [ ] 原型机硬件问题修复对照表