Merge branch 'dev_1.3.3' into dev_1.3.4

Conflicts:
	stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

@@ -171,7 +171,6 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
                 int skipCount = selectiveGroups.size() - selectiveGroups.get(0).getSelectiveCount() - 1;
                 dataQuery.setParameter("skipCount", skipCount);
             }
-
         }
         return dataQuery;
     }
@@ -226,4 +225,4 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
     private String getKey(ExamStudent student) {
         return student.getExamId() + "_" + student.getSubjectCode();
     }
-}
+}