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

admin

2019-12-16 54402107ca335c2896fc9c61864f6054ad5bfabb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java

@@ -195,7 +195,7 @@
    * @param inviteCode

    * @return

    */

   UserInfo getInfoByPhoneOrInviteCode(@Param("phone") String phone, @Param("inviteCode") String inviteCode);

   UserInfo getUserInfoByInviteCode(@Param("inviteCode") String inviteCode);



   // 根据AppId与电话号码获取用户

   List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);