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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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

@@ -11,9 +11,11 @@
   int insertSelective(UserActiveLog record);

   UserActiveLog selectByPrimaryKey(Long id);
	

   UserActiveLog selectLatestByUid(Long uid);

   UserActiveLog selectFirstActiveInfo(Long uid);

   int updateByPrimaryKeySelective(UserActiveLog record);

   int updateByPrimaryKey(UserActiveLog record);