Merge remote-tracking branch 'origin/master'

yujian

2019-05-29 85fa0a9ed1f6cec968ca8e7ee80db872eb22c9cb

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -290,5 +290,10 @@
      long count = hongBaoV2CountMapper.countNumberByUid(uid);

      return (int) count;

   }

	
   @Override

   public BigDecimal countRebateCouponMoney() {

      return hongBaoV2CountMapper.countRebateCouponMoney();

   }



}