11-13-2

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

@@ -58,7 +58,7 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok(competeScores);
     }
 
-<<<<<<< HEAD
+
     @MustLogin
     @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "")
     @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
@@ -77,6 +77,5 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok();
     }
 
-=======
->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041
+
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java

@@ -18,9 +18,8 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
     List<TableVo.SchedulePlanDetail> selectDetail ();
     List<TableVo.CompeteJoin> selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
     List<TableVo.CompeteJoin> selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
-<<<<<<< HEAD
     CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId);
-=======
+
 
     /**
      * 查询所有项目配置信息
@@ -28,5 +27,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
      * @return 返回所有比赛日程配置信息
      */
     List<TableVo.CompeteProjectConfig> queryProjectConfig(@Param("type")int type);
->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041
+
 }