Merge branch 'dev'

# Conflicts:
#	themis-business/src/main/java/com/qmth/themis/business/cache/ExamRecordCacheUtil.java
#	themis-business/src/main/resources/mapper/TEExamMapper.xml

themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -120,9 +120,9 @@
             tees.course_name as courseName,
             IFNULL(teea.opening_seconds,tee.opening_seconds) as openingSeconds,
             teea.opening_seconds as activityOpeningSeconds,
-            date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second) as prepareTime,
+            (teea.start_time / 1000 - IFNULL(teea.prepare_seconds, tee.prepare_seconds)) * 1000 as prepareTime,
             IFNULL(teea.start_time, tee.start_time) as minStartTime,
-            date_add(teea.start_time, interval IFNULL(teea.opening_seconds, tee.opening_seconds) second) as maxStartTime,
+            (teea.start_time / 1000 + IFNULL(teea.opening_seconds, tee.opening_seconds)) as maxStartTime,
             IF(tee.mode = 'TOGETHER' and tee.force_finish = 1, IFNULL(teea.finish_time , tee.end_time), null) as maxFinishTime,
             tee.monitor_video_source as monitorVideoSourceStr,
             IFNULL(teea.prepare_seconds,tee.prepare_seconds) as prepareSeconds,