解决冲突

This commit is contained in:
wangshiming
2022-02-09 17:23:50 +08:00
18 changed files with 203 additions and 138 deletions

View File

@ -75,7 +75,7 @@ export class ShipperBaseService extends BaseService {
const list = res.map(((item: any) => {
return {
label: item.name,
value: item.userId
value: item.appUserId
}
}))
const obj = [];
@ -100,7 +100,7 @@ export class ShipperBaseService extends BaseService {
const list = res.map(((item: any) => {
return {
label: `${item.name}/${item.telephone}`,
value: item.userId
value: item.appUserId
}
}))
return [...list];