Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-10 99edd3ce8ee02b358245bff195a9f63677ef61d6

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

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

   public BigDecimal getCumulativeMoney(Long uid);





}