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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

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

   public BigDecimal getCumulativeMoney(Long uid);





}