Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

# Conflicts:
#	manager/src/views/promotion/coupon/coupon.vue
#	seller/src/views/promotion/coupon/coupon.vue

manager/src/views/seller/shop/shopAuditList.vue

@@ -99,6 +99,15 @@
             key: "storeAddressPath",
             width: 300,
             sortable: false,
+            render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
           },
           {
             title: "是否自营",

manager/src/views/seller/shop/shopList.vue

@@ -111,7 +111,16 @@ export default {
           title: "店铺地址",
           key: "storeAddressPath",
           width: 300,
-          tooltip: true
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
         },
         {
           title: "是否自营",