Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@@ -82,7 +82,6 @@ public class CompeteVideoController {
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
         List<VideoProjectVo.GetTwoProject> list=iCompeteVedioService.selectTwoProject(params);
         return JsonResponse.newInstance().ok(list);
-
     }
     @MustLogin
     @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查")

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -549,6 +549,8 @@ public class CompeteVo {
 
         @ApiModelProperty("姓名")
         private String name;
+        @ApiModelProperty("场次")
+        private Byte competeOrder;
         @ApiModelProperty("场地信息")
         private Byte site;
         @ApiModelProperty("备注")

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -1752,6 +1752,8 @@ public class CompeteService implements ICompeteService {
             }
 
         }
+        //场次信息
+        selScropeVo.setCompeteOrder(competeStartOrder1.getCompeteOrder());
         //场地信息
         selScropeVo.setSite(competeStartOrder1.getSite());