Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java

src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java

@@ -73,7 +73,9 @@ public class VideoUController {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户");
         }
         Integer userAccountStatus = userAccountService.userAccountStatus(useId, param.getType());
-        if (1 != userAccountStatus) {
+        if(userAccountStatus ==null){
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到平台下的用户账号");
+        }else if(userAccountStatus != 1){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "账号不可用");
         }
 //        校验任务状态