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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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