解决冲突

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicSheetService.java

@@ -159,14 +159,6 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @return
      */
     Integer countTeacherMusicSheet(SysUser sysUser);
-    /***
-     * 查询待处理的记录数
-     * @author liweifan
-     * @updateTime 2022/3/30 18:41
-     * @return: java.lang.Integer
-     */
-    Integer getUserToDoNum();
-
     /**
      * 保存曲目信息
      *

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -268,11 +268,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     }
 
     @Override
-    public Integer getUserToDoNum() {
-        return baseMapper.getUserToDoNum();
-    }
-
-    @Override
     public boolean saveMusicSheet(MusicSheetDto musicSheetDto,Long userId) {
 
         if (musicSheetDto.getId() != null) {