Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/friend/service/impl/FriendServiceImpl.java

@@ -36,5 +36,13 @@
   public IPage<FriendVO> selectFriendPage(IPage<FriendVO> page, FriendVO friend) {
      return page.setRecords(baseMapper.selectFriendPage(page, friend));
   }
   @Override
   public IPage<FriendVO> friendApplication(IPage<FriendVO> page, FriendVO friend) {
      return page.setRecords(baseMapper.friendApplication(page, friend));
   }
   @Override
   public IPage<FriendVO> addFriend(IPage<FriendVO> page, FriendVO friend) {
      return page.setRecords(baseMapper.addFriend(page, friend));
   }

}