代码冲突合并

admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java

@@ -65,15 +65,12 @@ public interface CustomMapper extends ExtendMapper<CustomEntity> {
 		}
 		return wrapperX;
 	}
-	default List<CustomEntity> queryList(CustomQo customQo) {
-
 
 	default List<CustomEntity> queryList(CustomQo customQo) {
 		Wrapper<CustomEntity> wrapperX = buildQueryWrapper(customQo);
 		return this.selectList(wrapperX);
 	}
 
-
 	List<HomePageDTO> selectByCompanyIdAndTime(@Param("qo") HomePageQo homePageQo);
 
 	List<Integer> addCount(@Param("date") String date, @Param("companyId") Long companyId);