Merge branch 'dev' into 'test'

qty

See merge request quanshu/mp-ui-pc!81

src/views/business/coupon/index.vue

@@ -54,7 +54,7 @@
           {{ JSON.parse(row.type).desc }}
         </template>
       </el-table-column>
-      <el-table-column label="已领取数量" prop="quantity" />
+      <el-table-column label="已领取数量" prop="distributeQty" />
       <el-table-column label="有效期限(天)" prop="dueDays">
         <template slot-scope="{row}">
           领取后{{ row.dueDays }}天内有效
@@ -147,4 +147,4 @@ export default {
     }
   }
 }
-</script>
+</script>