Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

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

@@ -21,5 +21,12 @@
    * @param uid

    * @return

    */

   public long countRecordByUid(long exchangeid, Long uid);

   public long countRecordByUid(long exchangeid, Long uid, Integer today);



   /**

    * 添加兑换记录

    * @param exchangeid

    * @param uid

    */

   public void addExchangeRecord(long exchangeid, Long uid);

}