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

Pu Zhibing

昨天 bf2acefcf5ba801d3e4a4f507c5f064fc93625cc

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java

@@ -332,4 +332,8 @@

    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;

}