From eb0613044ac0ddb92ca786932f96479b10cacf11 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:40:26 +0800 Subject: [PATCH] 11-13-2 --- .../main/java/com/ccsens/mt/api/CompeteScoreController.java | 5 ++--- .../com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 4c19f8df..f5715c4b 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/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 + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java index 5281dc9c..6f31e47b 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -18,9 +18,8 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { List selectDetail (); List 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 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 queryProjectConfig(@Param("type")int type); ->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041 + } \ No newline at end of file