合并冲突

src/modules/system/customergroup/components/AddCustomer.vue

@@ -63,7 +63,7 @@ export default {
           {
             prop: 'created_by',
             label: '创建人',
-            minWidth: '100px',
+            // minWidth: '100px',
             computed({ row }) {
               return row.created_by.realname || row.created_by.nickname || row.created_by.username
             }

src/modules/system/customergroup/components/Customer.vue

@@ -59,7 +59,7 @@ export default {
           {
             prop: 'created_by',
             label: '创建人',
-            minWidth: '100px',
+            // minWidth: '100px',
             computed({ row }) {
               return row.created_by.realname || row.created_by.nickname || row.created_by.username
             }

src/modules/system/customergroup/components/Employees.vue

@@ -44,14 +44,22 @@ export default {
           }
         },
         columns: [
-          { label: '员工姓名', prop: 'sso_user.username', align: 'center' },
+          { label: '员工姓名', prop: 'sso_user.nickname', align: 'center' },
+          {
+            prop: 'sso_user',
+            label: '员工姓名',
+            // minWidth: '100px',
+            computed({ row }) {
+              return row.sso_user.realname || row.sso_user.nickname || row.sso_user.username
+            }
+          },
           { label: '手机号', prop: 'sso_user.mobile', align: 'center' },
           { label: '创建时间', prop: 'created_at', align: 'center' },
           // { label: '创建人', prop: 'created_by.username', align: 'center' },
           {
             prop: 'created_by',
             label: '创建人',
-            minWidth: '100px',
+            // minWidth: '100px',
             computed({ row }) {
               return row.created_by.realname || row.created_by.nickname || row.created_by.username
             }

src/modules/system/customergroup/views/List.vue

@@ -73,7 +73,7 @@ export default {
           {
             prop: 'created_by',
             label: '创建人',
-            minWidth: '100px',
+            // minWidth: '100px',
             computed({ row }) {
               return row.created_by.realname || row.created_by.nickname || row.created_by.username
             }