Merge remote-tracking branch 'origin/dev' into dev

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

@@ -53,7 +53,7 @@ public class TEQrcodeController {
 
 	@ApiOperation(value = "获取移动端拍照/录音上传二维码")
 	@RequestMapping(value = "/{uploadType}", method = RequestMethod.POST)
-	public Result mobileMonitor(@PathVariable String uploadType,@RequestBody QrUploadParamBean param) {
+	public Result upload(@PathVariable String uploadType,@RequestBody QrUploadParamBean param) {
 		if (param.getRecordId() == null) {
 			throw new BusinessException("recordId不能为空");
 		}