Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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



}