diff --git a/.idea/shelf/_2025_11_4_18_29____.xml b/.idea/shelf/_2025_11_4_18_29____.xml
deleted file mode 100644
index e3e10fb..0000000
--- a/.idea/shelf/_2025_11_4_18_29____.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/_2025_11_5_16_53____.xml b/.idea/shelf/_2025_11_5_16_53____.xml
deleted file mode 100644
index f22a789..0000000
--- a/.idea/shelf/_2025_11_5_16_53____.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/_2025_11_5_17_05____.xml b/.idea/shelf/_2025_11_5_17_05____.xml
deleted file mode 100644
index 8046378..0000000
--- a/.idea/shelf/_2025_11_5_17_05____.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/___1.xml b/.idea/shelf/___1.xml
deleted file mode 100644
index 8b9e037..0000000
--- a/.idea/shelf/___1.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/___2.xml b/.idea/shelf/___2.xml
deleted file mode 100644
index 125b9aa..0000000
--- a/.idea/shelf/___2.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch b/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
deleted file mode 100644
index 6d0e7e4..0000000
--- a/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Index: .idea/workspace.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {\r\n "customColor": "",\r\n "associatedIndex": 7\r\n}\r\n \r\n \r\n \r\n \r\n \r\n {\r\n "keyToString": {\r\n "ModuleVcsDetector.initialDetectionPerformed": "true",\r\n "RunOnceActivity.ShowReadmeOnStart": "true",\r\n "RunOnceActivity.git.unshallow": "true",\r\n "git-widget-placeholder": "dev",\r\n "kotlin-language-version-configured": "true",\r\n "last_opened_file_path": "D:/ysy/projectTest/Dbqb_Study",\r\n "node.js.detected.package.eslint": "true",\r\n "node.js.detected.package.tslint": "true",\r\n "node.js.selected.package.eslint": "(autodetect)",\r\n "node.js.selected.package.tslint": "(autodetect)",\r\n "nodejs_package_manager_path": "npm",\r\n "vue.rearranger.settings.migration": "true"\r\n }\r\n}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761647682116\r\n \r\n \r\n 1761647682116\r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761647865510\r\n \r\n \r\n \r\n 1761647865510\r\n \r\n \r\n \r\n 1761647873327\r\n \r\n \r\n \r\n 1761647873327\r\n \r\n \r\n \r\n 1761899062184\r\n \r\n \r\n \r\n 1761899062184\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/workspace.xml b/.idea/workspace.xml
---- a/.idea/workspace.xml (revision edcf1d41bd20b25159eb4d4871a422860b993976)
-+++ b/.idea/workspace.xml (date 1761983056305)
-@@ -4,7 +4,7 @@
-
-
-
--
-+
-
-
-
-@@ -13,96 +13,40 @@
-
-
-
-
-- {
-- "customColor": "",
-- "associatedIndex": 7
--}
--
--
--
--
--
-- {
-- "keyToString": {
-- "ModuleVcsDetector.initialDetectionPerformed": "true",
-- "RunOnceActivity.ShowReadmeOnStart": "true",
-- "RunOnceActivity.git.unshallow": "true",
-- "git-widget-placeholder": "dev",
-- "kotlin-language-version-configured": "true",
-- "last_opened_file_path": "D:/ysy/projectTest/Dbqb_Study",
-- "node.js.detected.package.eslint": "true",
-- "node.js.detected.package.tslint": "true",
-- "node.js.selected.package.eslint": "(autodetect)",
-- "node.js.selected.package.tslint": "(autodetect)",
-- "nodejs_package_manager_path": "npm",
-- "vue.rearranger.settings.migration": "true"
-- }
--}
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+
-
--
--
-- 1761647682116
--
--
-- 1761647682116
--
--
--
--
--
-+
-
-- 1761647865510
-+ 1761983013107
-
-
-
-- 1761647865510
-+ 1761983013107
-
--
-+
-
-- 1761647873327
-+ 1761983018907
-
-
-
-- 1761647873327
--
--
--
-- 1761899062184
--
--
--
-- 1761899062184
-+ 1761983018907
-
--
-+
-
-
--
--
--
-
--
--
--
-+
-+
-
-
-\ No newline at end of file
diff --git a/.idea/shelf/在变基之前未提交的更改_[更改]1/shelved.patch b/.idea/shelf/在变基之前未提交的更改_[更改]1/shelved.patch
deleted file mode 100644
index 87542ed..0000000
--- a/.idea/shelf/在变基之前未提交的更改_[更改]1/shelved.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: .idea/workspace.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/workspace.xml b/.idea/workspace.xml
---- a/.idea/workspace.xml (revision f366c0480cf623186a778468de70c0443ae1d471)
-+++ b/.idea/workspace.xml (date 1762333349191)
-@@ -4,7 +4,7 @@
-
-
-
--
-+
-
-
-
-@@ -18,13 +18,13 @@
-
-
-
-- {
-+ "keyToString": {
-+ "git-widget-placeholder": "dev",
-+ "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
-+ "node.js.selected.package.tslint": "(autodetect)"
- }
--}]]>
-+}
-
-
-
-@@ -42,11 +42,20 @@
-
- 1761983018907
-
--
-+
-+
-+ 1762333284024
-+
-+
-+
-+ 1762333284024
-+
-+
-
-
-
-
--
-+
-+
-
-
-\ No newline at end of file
diff --git a/.idea/shelf/在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]/shelved.patch b/.idea/shelf/在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]/shelved.patch
deleted file mode 100644
index 7452b51..0000000
--- a/.idea/shelf/在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]/shelved.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: .idea/workspace.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/workspace.xml b/.idea/workspace.xml
---- a/.idea/workspace.xml (revision 01f816774a0da35f14d27ece486a2a0b59203511)
-+++ b/.idea/workspace.xml (date 1762333474422)
-@@ -4,7 +4,7 @@
-
-
-
--
-+
-
-
-
-@@ -18,13 +18,13 @@
-
-
-
-- {
-+ "keyToString": {
-+ "git-widget-placeholder": "dev",
-+ "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
-+ "node.js.selected.package.tslint": "(autodetect)"
- }
--}]]>
-+}
-
-
-
-@@ -42,11 +42,20 @@
-
- 1761983018907
-
--
-+
-+
-+ 1762333284024
-+
-+
-+
-+ 1762333284024
-+
-+
-
-
-
-
--
-+
-+
-
-
-\ No newline at end of file
diff --git a/.idea/shelf/在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]/shelved.patch b/.idea/shelf/在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]/shelved.patch
deleted file mode 100644
index 8b776a9..0000000
--- a/.idea/shelf/在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]/shelved.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: .idea/workspace.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/workspace.xml b/.idea/workspace.xml
---- a/.idea/workspace.xml (revision 4681e03fcc05c7356d45b7a40efbce419ea0224d)
-+++ b/.idea/workspace.xml (date 1762252091887)
-@@ -4,7 +4,9 @@
-
-
-
--
-+
-+
-+
-
-
-
-@@ -17,14 +19,36 @@
-
-
-
-+
-+ {
-+ "associatedIndex": 8
-+}
-+
-+
-+
-+
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -41,9 +65,20 @@
-
-
- 1761983018907
-+
-+
-+
-+ 1762217324956
-+
-+
-+ 1762217324956
-+
-
-
-
-+
-+
-+
-
-
-
diff --git a/.idea/shelf/在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]/shelved.patch b/.idea/shelf/在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]/shelved.patch
deleted file mode 100644
index f346185..0000000
--- a/.idea/shelf/在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]/shelved.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: .idea/workspace.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983013107\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n 1761983018907\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/workspace.xml b/.idea/workspace.xml
---- a/.idea/workspace.xml (revision 2218bda5d4e6aaf85f33549b9bdb6d17399145da)
-+++ b/.idea/workspace.xml (date 1762307338233)
-@@ -4,7 +4,9 @@
-
-
-
--
-+
-+
-+
-
-
-
-@@ -17,14 +19,37 @@
-
-
-
-+
-+
-+
-+
-+
-+
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -42,8 +67,19 @@
-
- 1761983018907
-
-+
-+
-+ 1762304073766
-+
-+
-+ 1762304073766
-+
-+
-
-
-+
-+
-+
-
-
-
diff --git a/王洋学习笔记/11.12.txt b/王洋学习笔记/11.12.txt
new file mode 100644
index 0000000..14f13ed
--- /dev/null
+++ b/王洋学习笔记/11.12.txt
@@ -0,0 +1,44 @@
+11.12 Git学习
+
+1.初始化设置:
+(1)配置用户名:git config --global user.name “Your Name”
+(2)配置邮箱:git config --global user.email “Your Email”
+(3)存储配置:git config --global credential.helper store
+2.创建仓库:
+(1)创建一个新的本地仓库(省略project-name则在当前目录创建):git init
+(2)克隆一个远程仓库:git clone
+3.四个区域
+(1)工作区(Working Directory):就是你在电脑里能实际看到的目录
+(2)暂存区(Stage/Index):暂存区也叫索引,用来临时存放未提交的内容,一般在.git目录下的index中
+(3)本地仓库(Repository):Git在本地的版本库,仓库信息存储在.git这个隐藏目录中
+(4)远程仓库(Remote Repository):托管在远程服务器上的仓库,常用的有GitHub、GitLab、Gitee
+4.文件状态
+(1)已修改(Modified):修改了但是没有保存到暂存区的文件
+(2)已暂存(Staged):修改后已经保存到暂存区的文件
+(3)已提交(Committed):把暂存区的文件提交到本地仓库后的状态
+
+5.文件状态
+(1)默认主分支:main/master
+(2)默认远程仓库:origin
+(3)指向当前分支的指针:HEAD
+(4)上一个版本:HEAD^
+(5)上四个版本:HEAD~
+6.特殊文件
+(1).git Git仓库的元数据和对象数据库
+(2).gitignore 忽略文件,不需要提交到仓库的文件
+7.添加和提交
+(1)添加一个文件到暂存区:git add
+ 添加所有文件到暂存区:git add .
+(2)提交所有暂存区的文件到本地仓库:git commit -m “message”
+(3)提交所有已修改的文件到本地仓库:git commit -am “message”
+8.撤销和恢复
+(1)移动一个文件到新的位置:git mv
+(2)从工作区和暂存区删除一个文件,并且将这次删除放入暂存区:git rm
+(3)从索引/暂存区中删除文件,但是本地工作区文件还在,只是不希望这个文件被版本控制:git rm --cached
+
+
+9.查看状态或差异
+(1)查看仓库状态,列出还未提交的新的或修改的文件:git status
+(2)查看提交历史,--oneline表示简介模式: git log --oneline
+(3)查看未暂存的文件更新了哪些部分:git diff
+(4)查看两个提交之间的差异:git diff
\ No newline at end of file