Merge remote-tracking branch 'origin/master'

Pu Zhibing

10 天以前 7d46f01159d0a902f94eba48f17e68184412eb44

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

@@ -321,4 +321,13 @@
     * 获取未支付的跨城订单
     */
    List<UnPayOrderVO> getUnpayCrossCityOrders(Integer uid) throws Exception;

    /**
     * 添加申诉
     */
    void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg);

    void promotion(Integer orderId);


}