From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
admin/src/views/business/actionLog.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/actionLog.vue b/admin/src/views/business/actionLog.vue
index 9b6d040..dd23734 100644
--- a/admin/src/views/business/actionLog.vue
+++ b/admin/src/views/business/actionLog.vue
@@ -28,7 +28,7 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border>
<el-table-column prop="ridesObj.memberId" label="鐢ㄦ埛" min-width="180px" align="center">
<template slot-scope="{row}">
- {{ row.ridesObj ? row.ridesObj.memberId : '' }}
+ {{ row.ridesObj ? row.ridesObj.memberOpenid : '' }}
</template>
</el-table-column>
<el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center">
@@ -54,7 +54,7 @@
<el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" min-width="140px" align="center"></el-table-column>
<el-table-column prop="creatorName" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column>
<el-table-column prop="actReason" label="鍘熷洜" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="info" label="澶囨敞" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="actInfo" label="澶囨敞" min-width="100px" align="center"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
--
Gitblit v1.9.3