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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

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

@@ -901,8 +901,8 @@
         throw new UserInfoException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }



      if (userInfo.getState() != UserInfo.STATE_NORMAL) {

         throw new UserInfoException(1, "用户不存在");

      if (userInfo.getState() == UserInfo.STATE_DELETE || userInfo.getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) {

         throw new UserInfoException(Constant.CODE_FORBIDDEN_USER, "帐户已被删除，请重新登录");

      }



      // 淘宝昵称 组织