Merge remote-tracking branch 'origin/div' into div

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -246,7 +246,7 @@
    * @param orderNo

    * @return

    */

   public JSONObject getRewardJumpInfo(String orderNo);

   public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);



   /**

    * 根据交易号获取订单详情