Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.obsidian/plugins/recent-files-obsidian/data.json
#	.obsidian/workspace.json

.obsidian/workspace.json

@@ -299,18 +299,19 @@
       "password-protection:开启密码保护": false,
       "soundscapes:Soundscapes: My Music": false,
       "sheet-plus:创建 Excel 文件": false,
+      "hidden-folder-obsidian:隐藏文件夹": false,
       "periodic-notes:Open today": false
     }
   },
   "active": "b30dd120f71be716",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "01-工作日记/2025-08-08.md",
     "01-工作日记/2025-08-04.md",
     "01-工作日记/2025-08-03.md",
     "01-工作日记/2025-08-01.md",
     "README.md",
     "欢迎.md",
-    "01-工作日记/2025-08-08.md",
-    "conflict-files-obsidian-git.md",
     "03-学习笔记/Docker/mac 安装及使用docker_docker for mac-CSDN博客.md",
     "03-学习笔记/Docker/如何在Docker中，修改已经挂载的卷（Volume）.md",
     "03-学习笔记/Docker/Mac使用docker时，卷默认挂载路径-var-lib-docker-volumes不存在问题_mac docker 卷默认挂载路径不存在-CSDN博客.md",