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

yujian

2019-10-11 8b505f74e1094fd67f86373ab9e9f80b54bca54e

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