[Updated]解决冲突

.idea/.name

-README.md
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

.idea/workspace.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="8c148ad3-973a-4ceb-93eb-337ece26d4ac" name="默认变更列表" comment=" 代码">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings">
-    <execution />
-  </component>
-  <component name="Git.Settings">
-    <excluded-from-favorite>
-      <branch-storage>
-        <map>
-          <entry type="LOCAL">
-            <value>
-              <list>
-                <branch-info repo="$PROJECT_DIR$" source="master" />
-              </list>
-            </value>
-          </entry>
-        </map>
-      </branch-storage>
-    </excluded-from-favorite>
-    <option name="PREVIOUS_COMMIT_AUTHORS">
-      <list>
-        <option value="W13uuu &lt;1324072907@qq.com&gt;" />
-      </list>
-    </option>
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RESET_MODE" value="HARD" />
-  </component>
-  <component name="ProjectId" id="26q0W4fLWUdHlpiza2lLuyXkx4e" />
-  <component name="ProjectViewState">
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="8c148ad3-973a-4ceb-93eb-337ece26d4ac" name="默认变更列表" comment="" />
-      <created>1648135839352</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1648135839352</updated>
-      <workItem from="1648135842803" duration="91000" />
-      <workItem from="1648135981246" duration="254000" />
-      <workItem from="1648136256067" duration="116000" />
-      <workItem from="1648136386521" duration="27000" />
-      <workItem from="1648136424861" duration="837000" />
-      <workItem from="1648174942284" duration="1089000" />
-      <workItem from="1648177621633" duration="781000" />
-      <workItem from="1648182605399" duration="1758000" />
-      <workItem from="1648188289443" duration="164000" />
-      <workItem from="1648188484475" duration="2137000" />
-      <workItem from="1648190658337" duration="1780000" />
-      <workItem from="1648192674868" duration="1838000" />
-      <workItem from="1648194546898" duration="340000" />
-      <workItem from="1648196529012" duration="50000" />
-      <workItem from="1648201454871" duration="1736000" />
-      <workItem from="1648205014300" duration="1403000" />
-      <workItem from="1648206967477" duration="465000" />
-      <workItem from="1648207528556" duration="30000" />
-      <workItem from="1648207712286" duration="150000" />
-      <workItem from="1648208283868" duration="1431000" />
-    </task>
-    <task id="LOCAL-00001" summary="路由跳转 地图初见">
-      <created>1648136620754</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1648136620754</updated>
-    </task>
-    <task id="LOCAL-00002" summary="路由跳转 地图初见">
-      <created>1648175101720</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1648175101720</updated>
-    </task>
-    <task id="LOCAL-00003" summary="路由跳转 地图初见">
-      <created>1648177755576</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1648177755576</updated>
-    </task>
-    <task id="LOCAL-00004" summary="主页">
-      <created>1648177785150</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1648177785150</updated>
-    </task>
-    <task id="LOCAL-00005" summary="地图">
-      <created>1648182723206</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1648182723206</updated>
-    </task>
-    <task id="LOCAL-00006" summary="地图">
-      <created>1648188516482</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1648188516482</updated>
-    </task>
-    <task id="LOCAL-00007" summary="view">
-      <created>1648189188425</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1648189188427</updated>
-    </task>
-    <task id="LOCAL-00008" summary="about">
-      <created>1648191916358</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1648191916358</updated>
-    </task>
-    <task id="LOCAL-00009" summary=" 代码">
-      <created>1648194036830</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1648194036831</updated>
-    </task>
-    <task id="LOCAL-00010" summary=" 代码">
-      <created>1648201495944</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1648201495944</updated>
-    </task>
-    <task id="LOCAL-00011" summary=" 代码">
-      <created>1648206795503</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1648206795503</updated>
-    </task>
-    <task id="LOCAL-00012" summary=" 代码">
-      <created>1648207759534</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1648207759534</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="web" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="路由跳转 地图初见" />
-    <MESSAGE value="主页" />
-    <MESSAGE value="地图" />
-    <MESSAGE value="view" />
-    <MESSAGE value="about" />
-    <MESSAGE value=" 代码" />
-    <option name="LAST_COMMIT_MESSAGE" value=" 代码" />
-  </component>
-</project>
\ No newline at end of file