Merge remote-tracking branch 'origin/master'

yujian

2019-03-05 cdc5a3451b98a818a8f4b6fe646388460bbf4f98

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

@@ -18,6 +18,14 @@
   HongBaoOrder selectByCommonOrderId(Long id);

   /**
    * 根据红包ID查询对象
    * 
    * @param id
    * @return
    */
   HongBaoOrder selectByHongBaoId(Long id);

   /**
    * 返利订单列表（1.4.9之前）
    * 
    * @param uid