Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

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

   }



}