Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-31 617312cbc114c6ac38c8eb4a8bcda583c33dd72f

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -209,7 +209,7 @@
    * @return
    */
   CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo,
         @Param("orderState") Integer orderState);
         @Param("orderState") Integer orderState, @Param("sourceType") Integer sourceType);

   /**
    * 根据来源和交易ID获取订单详情