Merge branch 'master' of

http://git.qmth.com.cn/ExamCloud-3/examcloud-core-questions.git

Conflicts:
	examcloud-core-questions-starter/src/main/resources/classpath.location

examcloud-core-questions-starter/src/main/resources/classpath.location

@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+=======
+classpath 定位文件
+>>>>>>> branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-questions.git