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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java

@@ -122,13 +122,12 @@
   public List<Long> longTimeNoLogin(int daysNum, List<Long> list);



   /**

    * 根据电话号码、邀请码获取邀请用户

    * 根据邀请码获取邀请用户

    * 

    * @param phone

    * @param inviteCode

    * @return

    */

   public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode);

   public UserInfo getUserInfoByInviteCode(String inviteCode);



   /**

    * 根据电话号码 获取有效用户