Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java

@@ -125,5 +125,13 @@
   
   List<HongBaoV2VO> listShareAndInviteMoney(@Param("start") long start, @Param("count") int count,
         @Param("date") String date);
	
	
   /**
    * 统计奖励券总金额
    * @return
    */
   BigDecimal countRebateCouponMoney();
	

}