Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/wallet/mch-thrid-zy.ts

@@ -27,7 +27,7 @@ export function syncAllRole(query?: any) {
 	})
 }
 
-// 同步全部身份
+// 同步全部账号信息
 export function syncAllUser(query?: any) {
 	return request({
 		url: "/wallet/mch-third-zy/sync-all-user",

src/views/wallet/wallet-active/index.vue

@@ -56,10 +56,10 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="80" />
 				<el-table-column prop="username" label="用户" show-overflow-tooltip />
 				<el-table-column prop="userMobile" label="手机号" show-overflow-tooltip />
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
+				<el-table-column prop="merchantName" label="所属商户" show-overflow-tooltip />
 				<el-table-column prop="cardNumber" label="用户卡号" show-overflow-tooltip />
 				<el-table-column prop="isActiveHardware" label="是否激活" show-overflow-tooltip>
 					<template #default="{ row }">

src/views/wallet/wallet-setting/components/third-zy/index.vue

@@ -161,7 +161,7 @@ const unitOfAccountSync = async () => {
 const accountInfoSync = async () => {
 	loadingStart()
 	try {
-		const res = await syncAllRole()
+		const res = await syncAllUser()
 		if (res.code === 0) {
 			return useMessage().success("同步成功")
 		}
@@ -177,7 +177,7 @@ const accountInfoSync = async () => {
 const identityInfoSync = async () => {
 	loadingStart()
 	try {
-		const res = await syncAllUser()
+		const res = await syncAllRole()
 		if (res.code === 0) {
 			return useMessage().success("同步成功")
 		}