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

yujian

2019-08-30 a8ba157aefdf0922037c197daba6b859bc30bf22

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