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

yujian

2019-10-21 ec76ed67c8154454ad608fb46d82a86e265a874a

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java

@@ -13,6 +13,6 @@
    * @param list
    * @return
    */
   long countRecordByUid(@Param("exchangeId") Long exchangeId, @Param("uid") Long uid);
   long countRecordByUid(@Param("exchangeId") Long exchangeId, @Param("uid") Long uid, @Param("today") Integer today);
   
}