Merge branch 'dev' into fix_customer_issues
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
489df51d64
commit
e210ad7de4
|
@ -63,11 +63,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
<<<<<<< HEAD
|
|
||||||
format: (row) => dashIfEmpty(row.agencyMode?.name),
|
format: (row) => dashIfEmpty(row.agencyMode?.name),
|
||||||
=======
|
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.agencyMode?.name),
|
|
||||||
>>>>>>> dev
|
|
||||||
columnClass: 'expand',
|
columnClass: 'expand',
|
||||||
label: t('Agency'),
|
label: t('Agency'),
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue