Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-11 1151bde4c247b3801f7ab750c7abcc79a6514e10

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/InviteOrderSubsidyServiceV2.java

@@ -84,4 +84,6 @@
    * @return

    */

   public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level);



   public BigDecimal sumMoneyByUidAndDateAndState(long uid, Integer day, Integer level, Integer state);

}