Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

 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