Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 051abca66db233f5dbde3f69aa706422e1ac9fd9

 admin/src/views/business/bikeRetakeRecord.vue

@@ -45,16 +45,16 @@
        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="paramId" 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="bikeType" label="车辆类型" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="rentSiteId" label="借出站点" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="rentLockId" label="借出锁具号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="rentDate" label="借出时间" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="paramId" 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="backSiteId" label="归还站点" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="backLockId" label="归还锁具号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="backDate" label="归还时间" min-width="140px" align="center"></el-table-column>
        <el-table-column prop="duration" label="借出时长(分)" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="rideTime" label="借出时长(分)" fixed="right" min-width="100px" align="center"></el-table-column>

        <!-- <el-table-column prop="creator" label="创建人" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="编辑时间" min-width="100px"></el-table-column>
@@ -151,7 +151,7 @@
  created () {
    this.config({
      module: '用户骑行记录表',
      api: '/business/memberRides',
      api: '/business/bikeRetakeRecord',
      'field.id': 'id',
      'field.main': 'id'
    })