Merge branch 'cheney' into dev

src/views/shop-information/useColumns.tsx

@@ -714,7 +714,7 @@ export const shopInfoColumns = [
     }
   },
   {
-    field: 'countComputer', title: '店铺数量', minWidth: 'auto', align: 'center',
+    field: 'countComputer', title: '电脑数量', minWidth: 'auto', align: 'center',
     slots: {
       default({ row }: any) {
         return <span class={ 'font-medium' }>{ row.countComputer ? row.countComputer : '--' }</span>;