Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -934,7 +934,7 @@
      String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();

      

      userInfo.setPortrait(fileLink);

      userInfoMapper.updateByPrimaryKey(userInfo);

      userInfoMapper.updateByPrimaryKeySelective(userInfo);

   }

   

   

@@ -945,9 +945,7 @@
         throw new UserInfoException(1, "用户不存在");

      }

      

      UserInfo updateInfo = new UserInfo();

      updateInfo.setId(userInfo.getId());

      updateInfo.setNickName(nickName);

      userInfoMapper.updateByPrimaryKeySelective(updateInfo);

      userInfo.setNickName(nickName);

      userInfoMapper.updateByPrimaryKeySelective(userInfo);

   }

}