Merge remote-tracking branch 'origin/main'

.gitignore

+node_modules
+nohup.out
+.eslintrc.cjs
+.vscode

README.md

+<<<<<<< HEAD
 # vue101
 
 This template should help get you started developing with Vue 3 in Vite.
@@ -33,3 +34,6 @@ npm run build
 ```sh
 npm run lint
 ```
+=======
+
+>>>>>>> origin/main