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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

 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);
   
}