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

liujie

7 天以前 6f77dcd80df0081466d49c933fff74afedf867b8

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java

@@ -327,4 +327,8 @@
     */
    void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg);

    void promotion(Integer orderId);

    List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception;
    List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception;
}