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

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

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

@@ -14,7 +14,7 @@
    * @param maxTime

    * @return

    */

   public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime);

   public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime, Integer type);



   /**

    * 明细统计

@@ -23,7 +23,7 @@
    * @param maxTime

    * @return

    */

   public long countDetailForClient(Long uid, Long detailId, Date maxTime);

   public long countDetailForClient(Long uid, Long detailId, Date maxTime, Integer type);