Merge remote-tracking branch 'origin/master' into test

fuliqi

2024-10-28 81e16742530ddcd86b368678bad74fc8eb471c63

 src/views/profile/components/Timeline.vue

@@ -3,13 +3,11 @@
    <el-timeline>
      <el-timeline-item  placement="top" :timestamp="userInfo.lastActiveTime">
        <el-card>
          <h4>最后活动时间</h4>
          <p>{{ userInfo.realName+'在校考系统中最后活动了' }}</p>
        </el-card>
      </el-timeline-item>
      <el-timeline-item  placement="top" :timestamp="userInfo.createTime">
        <el-card>
          <h4>加入时间</h4>
          <p>{{ userInfo.realName+'加入了校考系统' }}</p>
        </el-card>
      </el-timeline-item>
@@ -20,17 +18,6 @@
<script>

export default {
  props: {
    userInfo: {
      type: Object,
      default: () => {
        return {
          realName: '',
          lastActiveTime: '',
          createTime: ''
        }
      }
    }
  }
  props: ['userInfo'],
}
</script>