Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 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();

   }



}