Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java

@@ -13,6 +13,8 @@
   UserActiveLog selectByPrimaryKey(Long id);
   
   UserActiveLog selectLatestByUid(Long uid);

   UserActiveLog selectFirstActiveInfo(Long uid);

   int updateByPrimaryKeySelective(UserActiveLog record);