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

admin

2020-02-27 be05279bfbc10defc002d7718f46a49f3c96d05e

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java

@@ -48,4 +48,5 @@
    */

   public BigDecimal getCumulativeMoney(Long uid);





}