Merge remote-tracking branch 'origin/master'

# Conflicts:
#	web/.env.development
#	web/src/api/project.js
#	web/src/api/user.js
#	web/src/view/login/index.vue
#	web/src/view/projectManage/projectApproval/projectApproval.vue
#	web/src/view/projectManage/projectDetails/projectDetails.vue
#	web/src/view/projectManage/projectList/projectList.vue

web/package.json

@@ -55,6 +55,7 @@
         "dotenv": "^16.3.1",
         "eslint": "^8.49.0",
         "eslint-plugin-vue": "^9.15.1",
+        "less": "^4.2.0",
         "sass": "^1.54.0",
         "terser": "^5.19.1",
         "unplugin-auto-import": "^0.16.6",

web/src/pinia/modules/user.js

@@ -56,6 +56,7 @@ export const useUserStore = defineStore('user', () => {
     })
     try {
       const res = await login(loginInfo)
+      console.log(res)
       if (res.code === 0) {
         setUserInfo(res.data.user)
         setToken(res.data.token)