diff --git a/.history/.env_20231120000626.development b/.history/.env_20231120000626.development
new file mode 100644
index 00000000..8a5ac89f
--- /dev/null
+++ b/.history/.env_20231120000626.development
@@ -0,0 +1,23 @@
+# Whether to open mock
+VITE_USE_MOCK = false
+
+# public path
+VITE_PUBLIC_PATH = /
+
+# Cross-domain proxy, you can configure multiple
+# Please note that no line breaks
+# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY = [["/upload","http://10.0.8.16:8080"]]
+# VITE_PROXY=[["/api","https://vvbin.cn/test"]]
+
+# Delete console
+VITE_DROP_CONSOLE = false
+
+# Basic interface address SPA
+VITE_GLOB_API_URL = http://127.0.0.1:8080
+
+# File upload address， optional
+VITE_GLOB_UPLOAD_URL = /upload
+
+# Interface prefix
+VITE_GLOB_API_URL_PREFIX=
diff --git a/.history/.env_20231120000651.development b/.history/.env_20231120000651.development
new file mode 100644
index 00000000..4b02e415
--- /dev/null
+++ b/.history/.env_20231120000651.development
@@ -0,0 +1,14 @@
+# Whether to open mock
+VITE_USE_MOCK = false
+
+# public path
+VITE_PUBLIC_PATH = /
+
+# Basic interface address SPA
+VITE_GLOB_API_URL = http://127.0.0.1:8080
+
+# File upload address， optional
+VITE_GLOB_UPLOAD_URL = /upload
+
+# Interface prefix
+VITE_GLOB_API_URL_PREFIX=
diff --git a/.history/.prettierrc_20231120000353.js b/.history/.prettierrc_20231120000353.js
new file mode 100644
index 00000000..2eb2a516
--- /dev/null
+++ b/.history/.prettierrc_20231120000353.js
@@ -0,0 +1,23 @@
+module.exports = {
+  printWidth: 100,
+  semi: false,
+  vueIndentScriptAndStyle: true,
+  singleQuote: true,
+  trailingComma: 'all',
+  proseWrap: 'never',
+  htmlWhitespaceSensitivity: 'strict',
+  endOfLine: 'auto',
+<<<<<<< HEAD:.prettierrc.js
+  plugins: ['prettier-plugin-packagejson'],
+  overrides: [
+    {
+      files: '.*rc',
+      options: {
+        parser: 'json',
+      },
+    },
+  ],
+};
+=======
+}
+>>>>>>> thin:prettier.config.js
diff --git a/.history/.prettierrc_20231120000715.js b/.history/.prettierrc_20231120000715.js
new file mode 100644
index 00000000..9bda3873
--- /dev/null
+++ b/.history/.prettierrc_20231120000715.js
@@ -0,0 +1,19 @@
+module.exports = {
+  printWidth: 100,
+  semi: false,
+  vueIndentScriptAndStyle: true,
+  singleQuote: true,
+  trailingComma: 'all',
+  proseWrap: 'never',
+  htmlWhitespaceSensitivity: 'strict',
+  endOfLine: 'auto',
+  plugins: ['prettier-plugin-packagejson'],
+  overrides: [
+    {
+      files: '.*rc',
+      options: {
+        parser: 'json',
+      },
+    },
+  ],
+};
diff --git a/.history/.prettierrc_20231120000742.js b/.history/.prettierrc_20231120000742.js
new file mode 100644
index 00000000..4a24e88c
--- /dev/null
+++ b/.history/.prettierrc_20231120000742.js
@@ -0,0 +1,19 @@
+module.exports = {
+  printWidth: 100,
+  semi: true,
+  vueIndentScriptAndStyle: true,
+  singleQuote: true,
+  trailingComma: 'all',
+  proseWrap: 'never',
+  htmlWhitespaceSensitivity: 'strict',
+  endOfLine: 'auto',
+  plugins: ['prettier-plugin-packagejson'],
+  overrides: [
+    {
+      files: '.*rc',
+      options: {
+        parser: 'json',
+      },
+    },
+  ],
+};