Merge branch 'dev' into test

src/views/commodity/hot_list/index.vue

@@ -347,6 +347,20 @@ const columns = ref([
       )
     },
   },
+  {
+    title: '商家名称',
+    slot: 'store_name',
+    align: 'center',
+    render: (row) => {
+      return h(
+        'span',
+        {},
+        {
+          default: () => row.Store.name,
+        }
+      )
+    },
+  },
   {
     title: '商品封面',
     slot: 'cover',