Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

3 天以前 6f77dcd80df0081466d49c933fff74afedf867b8

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java

@@ -313,4 +313,16 @@

    void promotion(Integer orderId);

    /**
     * 获取我的行程列表
     * @param uid
     * @param pageNum
     * @param size
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception;

    List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception;

}