Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

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

@@ -8,7 +8,7 @@
             <span>订单编号：{{ orderDetail.orderId }}</span>
             <span>下单时间：{{ orderDetail.createTime }}</span>
             <span>商户：{{ orderDetail.companyWechatName || '无' }}</span>
-            <span v-if="orderDetail.cancelName">"取消人：{{ orderDetail.cancelName }}</span>
+            <span v-if="orderDetail.cancelName">取消人：{{ orderDetail.cancelName }}</span>
             <span v-if="orderDetail.cancelTime">取消时间：{{ orderDetail.cancelTime }}</span>
             <!-- <span>网点：{{ orderDetail.websitName || '无' }}</span> -->
             <el-tag v-if="orderDetail.isOld == 'YES'">以旧换新</el-tag>