解决冲突

common/src/main/java/com/jpsoft/bus/modules/bus/service/RouteTimeTableService.java

@@ -14,8 +14,6 @@ public interface RouteTimeTableService {
 	int delete(String id);
 	List<RouteTimeTable> list();
     RouteTimeTable findByRouteId(String routeId);
-	Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
-
 	List<RouteTimeTable> findListByRouteId(String routeId);
 	Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/RouteTimeTableServiceImpl.java

@@ -67,12 +67,6 @@ public class RouteTimeTableServiceImpl implements RouteTimeTableService {
 
 
 	@Override
-	public Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<RouteTimeTable> page = PageHelper.startPage(1,10).doSelectPage(()->{
-            routeTimeTableDAO.search(searchParams,sortList);
-        });
-
-        return page;
 	public Page<RouteTimeTable> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
 		Page<RouteTimeTable> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
 			routeTimeTableDAO.search(searchParams,sortList);