商家

pt/src/saas/shop/shop.vue

@@ -115,14 +115,14 @@
                                 align: 'center'
                             },
                             {
-                                prop: 'shopName',
-                                label: '门店',
+                                prop: 'merchantName',
+                                label: '商家',
                                 width: '120',
                                 align: 'center'
                             },
                             {
-                                prop: 'merchantName',
-                                label: '商家',
+                                prop: 'shopName',
+                                label: '门店',
                                 width: '120',
                                 align: 'center'
                             },