Merge remote-tracking branch 'origin/master'

admin

2019-07-11 24739c7e321adca7729754cbd882f417f1b87d24

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java

@@ -36,6 +36,13 @@
      return userActiveLogMapper.selectLatestByUid(uid);

   }



   @Override

   public UserActiveLog getFirstActiveInfo(Long uid) {

		
		
      return userActiveLogMapper.selectFirstActiveInfo(uid);

   }