Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/consume/allConsume.vue

@@ -333,8 +333,8 @@ getGoods();
             style="width: 100%"
             :default-sort="{ prop: 'createTime ', order: 'descending' }"
           >
-            <el-table-column prop="userName" label="姓名" width="80px" />
-            <el-table-column prop="jwcode" label="精网号" width="180px" />
+            <el-table-column prop="name" label="姓名" width="150px" />
+            <el-table-column prop="jwcode" label="精网号" width="120px" />
             <el-table-column prop="area" label="所属地区" width="120px" />
             <el-table-column prop="productName" label="商品" width="200px" />
             <el-table-column

vue/gold-system/src/views/refund/allRefund.vue

@@ -403,8 +403,8 @@ const checkNumber = function () {
             :height="tableHeight"
             style="width: 100%"
           >
-            <el-table-column prop="userName" label="姓名" width="80px" />
-            <el-table-column prop="jwcode" label="精网号" width="180px" />
+            <el-table-column prop="userName" label="姓名" width="150px" />
+            <el-table-column prop="jwcode" label="精网号" width="120px" />
             <el-table-column prop="adminArea" label="所属地区" width="120px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
             <el-table-column