From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/memberRides.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/memberRides.vue b/admin/src/views/business/memberRides.vue
index 5446f02..7bfa153 100644
--- a/admin/src/views/business/memberRides.vue
+++ b/admin/src/views/business/memberRides.vue
@@ -45,12 +45,12 @@
stripe
border
>
- <el-table-column prop="memberId" label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column>
+ <el-table-column prop="openid" label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column>
<el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="paramId" label="杞﹁締绫诲瀷缂栫爜" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rentDate" label="绉熻溅鏃堕棿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="duration" label="楠戣璁¤垂鏃堕暱" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="bikeType" label="杞﹁締绫诲瀷" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="duration" label="璁¤垂鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="rentDate" label="鍒涘缓鏃堕棿" min-width="100px" align="center"></el-table-column>
<el-table-column prop="backDate" label="杩樿溅鏃堕棿" min-width="100px" align="center"></el-table-column>
<el-table-column prop="closeStatus" label="缁撶畻鐘舵��" min-width="100px" align="center">
<!-- 0鏈粨绠� 1宸茬粨鏉� -->
--
Gitblit v1.9.3