代码合并问题解决

performance-web/src/main/java/com/clx/performance/dao/impl/IntegralRecordDaoImpl.java

@@ -49,11 +49,6 @@ public class IntegralRecordDaoImpl extends BaseDaoImpl<IntegraRecordMapper, Inte
         return baseMapper.sumByStatisticsIdAndTypes(statisticsId, typeList);
     }
 
-    @Override
-    public Integer sumByStatisticsIdAndTypes(Integer statisticsId, List<Integer> typeList) {
-        return baseMapper.sumByStatisticsIdAndTypes(statisticsId, typeList);
-    }
-
     @Override
     public Integer sumByStatisticsIdAndTypeAndTime(Integer statisticsId, Integer type, String beginTime, String endTime) {
         return baseMapper.sumByStatisticsIdAndTypeAndTime(statisticsId, type, beginTime, endTime);