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/dao/OrderTaxiMapper.java

@@ -89,4 +89,16 @@
     */
    List<OrderTaxi> queryByState_(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
                                  @Param("type") Integer type, @Param("state") Integer...state);

    /**
     * 获取用户的行程列表
     * @param uid
     * @param pageNum
     * @param size
     * @return
     */
    List<Map<String, Object>> queryMyTripList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum,
                                               @Param("size") Integer size);

    List<Map<String, Object>> queryMyTripListAll(@Param("uid") Integer uid);
}