Merge branch 'master' into feature/crm_pc

# Conflicts:
#	.gitignore
#	src/api/crmApi.ts
#	src/api/usersApi.ts
#	src/store/modules/user.ts
#	src/utils/http/index.ts
#	src/views/auth/login/index.vue
#	src/views/crmpc/customer/Show.vue
#	src/views/crmpc/customer/index.vue

.gitignore

@@ -4,4 +4,5 @@ dist
 dist-ssr
 *.local
 .cursorrules
-src/types/components.d.ts
+src/types/components.d.ts
+.vscode

src/api/crmApi.ts

@@ -74,7 +74,8 @@ export class CrmService {
   //更新客户标签 /crm/tagGroup/updatePivot
   static tagGroupupdatePivot(params: any) {
     return request.get<Api.Work.AddResponse>({
-      url: '/crm/tagGroup/updatePivot'
+      url: '/crm/tagGroup/updatePivot',
+      params
     })
   }
   //跟进列表crm/follow/list