record 新增技能获取记录fix

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/mapper/TimeControlTaskSubscribeMapper.java

@@ -32,15 +32,11 @@ public interface TimeControlTaskSubscribeMapper {
 
     void completedTaskById(Integer subscribeId);
 
-<<<<<<< HEAD
     /**
      * 查询参与人数和完成人数
      * @param taskId
      * @return
      */
     TaskProgressDTO getSubscribeStatics(@Param("taskId") Integer taskId);
-=======
-    //查询用户
-    Integer getTaskRecordCount(String wxUserId);
->>>>>>> 个人中心
+
 }