Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-12 b62c6c9ab29e933fd0333ac183ef837d00aba5d2

 src/api/user.js

@@ -19,5 +19,7 @@
  selectByUserName: query => post('/api/admin/user/selectByUserName', query),
  addMeetin:query => post('/api/admin/video/add', query),
  delMeetin:query => post('/api/admin/video/clear', query),
  setStatus:query => post('/api/admin/user/setStatus', query)
  setStatus:query => post('/api/admin/userCondition/examine/save', query),
  getFailExamUser:query => get('/api/admin/user/getFailExamUser/' + query),
  getFailTemplateUser:query => get('/api/admin/user/getFailTemplateUser/' + query)
}