Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

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

@@ -213,11 +213,5 @@
    */

   public void saveUserInfo(String nickName, Long uid) throws UserInfoException;



   /**

    * 封禁用户

    * 
    * @param uid

    */

   public void forbiddenUser(Long uid,String reason);



}