Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -378,7 +378,7 @@ public class TEExamController {
             //根据roomCode获取当前老师所要监考的全部应考学生数
             QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
             teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getExamId, examId)
-                    .in(TEExamStudent::getRoomCode, roomCodeSet).eq(TEExamStudent::getEnable, 1);
+                    .in(TEExamStudent::getRoomCode, roomCodeSet);
             List<TEExamStudent> teExamStudentList = teExamStudentService.list(teExamStudentQueryWrapper);
             Set<String> studentSet = null;
             Set<Long> examActivityIdSet = null;

themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java

@@ -60,7 +60,7 @@ public class SysController {
         VersionBean v = new VersionBean();
         v.setName("1.2.0");
         v.setValue(12);
-        v.setUrl("xxxxxx");
+        v.setUrl("http://qmth-test.oss-cn-shenzhen.aliyuncs.com/client/v1.0.0/index.json");
         env.setVersion(v);
         boolean oss = dictionaryConfig.sysDomain().isOss();
         String url = null;