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

admin

2020-03-15 b16f2b0126281e87346db9e6efd1db960ecc872a

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

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.inter.user.integral;



import java.math.BigDecimal;

import java.util.Date;

import java.util.List;



@@ -40,4 +41,12 @@
    */

   public IntegralDetail getDetailByUniqueKey(String uniqueKey);



   /**

    * 查询历史到账金币

    * @param uid

    * @return

    */

   public BigDecimal getCumulativeMoney(Long uid);





}