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

fuliqi

2024-06-26 f378fbf3ee8bd599b0746e48ba3811ae4b8b87cd

 src/router.js

@@ -258,7 +258,13 @@
        component: () => import('@/views/education/resource/list'),
        name: 'EducationResourcePage',
        meta: { title: '教学资源', noCache: true }
      }
      },
      {
        path: 'cheat/list',
        component: () => import('@/views/education/cheat/list'),
        name: 'EducationCheatPage',
        meta: { title: '作弊记录', noCache: true }
      },
    ]
  },
  {