Merge branch 'moss_bug'

* moss_bug:
  no message

src/views/mallManagement/order/order_detail/index.vue

@@ -217,6 +217,8 @@
         <el-table-column prop="userRefundAmount" label="用户维权金额" align="center" min-width="110"></el-table-column>
         <el-table-column prop="refundNum" label="退款数量" align="center"></el-table-column>
         <el-table-column prop="refundAmount" label="退款金额" align="center"></el-table-column>
+        <el-table-column prop="refundBy" label="退款人" align="center"></el-table-column>
+        <el-table-column prop="refundTime" label="退款时间" align="center" min-width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="160" v-if="orderDetail.orderStatus != 'CLOSE' && orderDetail.payTypeId == 'WECHAT'">
           <template slot-scope="scope">
             <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="primary"

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -128,11 +128,13 @@
         <el-table-column prop="userRefundAmount" label="用户维权金额" align="center"></el-table-column>
         <el-table-column prop="refundAmount" label="退款金额" align="center"></el-table-column>
         <el-table-column prop="refundNum" label="退款数量" align="center"></el-table-column>
-        <el-table-column label="退款时间" align="center" min-width="160">
+        <el-table-column prop="refundBy" label="退款人" align="center"></el-table-column>
+        <el-table-column prop="refundTime" label="退款时间" align="center" min-width="160"></el-table-column>
+        <!-- <el-table-column label="退款时间" align="center" min-width="160">
           <template>
             {{ orderDetail.examineTime || '' }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <div class="order-amount-info">
         <el-row>