Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java

@@ -123,4 +123,11 @@
    */

   BigDecimal computeMoneyByUidAndState(Long uid,int state);



   /**

    * 查询子红包

    * @param id

    * @return

    */

   public List<HongBaoV2> listChildrenById(Long id);



}