Merge branch 'master' of…

Merge branch 'master' of https://codeup.aliyun.com/62eb413b37e2c6c98549e0c9/gsh-hr-department/mp-enterprise-people-recruitment-h5

Merge branch 'master' of…
a098c1a9 · 陈宗胤（贵阳日报） · 4c2b977d · c37ed5d3 · a098c1a9 · a098c1a9
Commit a098c1a9 authored Oct 10, 2024 by 陈宗胤（贵阳日报）
12 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ node_modules
 dist
 build
 *.local
+yarn.lock
+package-lock.json
 # Editor directories and files
 .idea

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
    "files.eol": "\n",
    "typescript.tsdk": "node_modules/typescript/lib",
    "[vue]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "octref.vetur"
    },
    "[typescript]": {
        "editor.defaultFormatter": "esbenp.prettier-vscode"

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/api/user.js
+++ b/src/api/user.js
--- a/src/main.ts
+++ b/src/main.ts
--- a/src/pages.json
+++ b/src/pages.json
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
--- a/src/pages/user/feedbackDetails/index.vue
+++ b/src/pages/user/feedbackDetails/index.vue
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
--- a/src/pages/user/problemRecord/index.vue
+++ b/src/pages/user/problemRecord/index.vue
--- a/yarn.lock
+++ b/yarn.lock