xinyouhe/art-design
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/crm_pc

Browse Source 
# 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
This commit is contained in:
浅念
2025-07-21 18:22:55 +08:00
parent c7d890809c d7ab6f1a11
commit d3bb4ec6e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -5,3 +5,4 @@ dist-ssr
*.local *.local
.cursorrules .cursorrules
src/types/components.d.ts src/types/components.d.ts
.vscode
src/api/crmApi.ts
+2 -1
View File
@@ -74,7 +74,8 @@ export class CrmService {
//更新客户标签 /crm/tagGroup/updatePivot //更新客户标签 /crm/tagGroup/updatePivot
static tagGroupupdatePivot(params: any) { static tagGroupupdatePivot(params: any) {
return request.get<Api.Work.AddResponse>({ return request.get<Api.Work.AddResponse>({
url: '/crm/tagGroup/updatePivot' url: '/crm/tagGroup/updatePivot',
params
}) })
} }
//跟进列表crm/follow/list //跟进列表crm/follow/list