Merge branch 'zzm'

docs/.vitepress/cache/deps/_metadata.json

@@ -1,37 +1,65 @@
 {
+<<<<<<< HEAD
   "hash": "f01e8699",
   "configHash": "180cc241",
   "lockfileHash": "d0a71e3e",
   "browserHash": "c5767560",
+=======
+  "hash": "e098b266",
+  "configHash": "72a3e532",
+  "lockfileHash": "d0a71e3e",
+  "browserHash": "ab8f4b96",
+>>>>>>> zzm
   "optimized": {
     "vue": {
       "src": "../../../../node_modules/vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
+<<<<<<< HEAD
       "fileHash": "ffd8baa8",
+=======
+      "fileHash": "4de6bb48",
+>>>>>>> zzm
       "needsInterop": false
     },
     "vitepress > @vue/devtools-api": {
       "src": "../../../../node_modules/@vue/devtools-api/dist/index.js",
       "file": "vitepress___@vue_devtools-api.js",
+<<<<<<< HEAD
       "fileHash": "c91fbfa8",
+=======
+      "fileHash": "05a8531e",
+>>>>>>> zzm
       "needsInterop": false
     },
     "vitepress > @vueuse/core": {
       "src": "../../../../node_modules/vitepress/node_modules/@vueuse/core/index.mjs",
       "file": "vitepress___@vueuse_core.js",
+<<<<<<< HEAD
       "fileHash": "b91f8785",
+=======
+      "fileHash": "95fd6205",
+>>>>>>> zzm
       "needsInterop": false
     },
     "@theme/index": {
       "src": "../../../../node_modules/vitepress/dist/client/theme-default/index.js",
       "file": "@theme_index.js",
+<<<<<<< HEAD
       "fileHash": "d3d29b5d",
+=======
+      "fileHash": "29ee9ca0",
+>>>>>>> zzm
       "needsInterop": false
     }
   },
   "chunks": {
+<<<<<<< HEAD
     "chunk-SMHOW2GZ": {
       "file": "chunk-SMHOW2GZ.js"
+=======
+    "chunk-X2Z2PDUS": {
+      "file": "chunk-X2Z2PDUS.js"
+>>>>>>> zzm
     },
     "chunk-SFNBNC2X": {
       "file": "chunk-SFNBNC2X.js"

docs/.vitepress/cache/deps/vitepress___@vueuse_core.js

@@ -281,8 +281,13 @@ import {
   watchTriggerable,
   watchWithFilter,
   whenever
+<<<<<<< HEAD
 } from "./chunk-SMHOW2GZ.js";
 import "./chunk-SFNBNC2X.js";
+=======
+} from "./chunk-X2Z2PDUS.js";
+import "./chunk-JD3CXNQ6.js";
+>>>>>>> zzm
 export {
   DefaultMagicKeysAliasMap,
   StorageSerializers,

docs/.vitepress/config.ts

@@ -36,10 +36,8 @@ export default defineConfig({
         text: "ex",
         items: [{ text: "龚涵博", link: "/ghb" }],
       },
-      {
-        text: "吴子妍",
-        items: [{ text: "第三次研讨会笔记", link: "/note3-tables" }],
-      },
+        
+      
       {
         text: "石亚玲",
         items: [
@@ -48,6 +46,11 @@ export default defineConfig({
           { text: "日程表", link: "石亚玲/schedule" },
         ],
       },
+          { text: '龚涵博', link :'/ghb'}
+        ]
+      }
+
+
     ],
 
     socialLinks: [