Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -442,14 +442,4 @@
      //查询用户信息并返回
      return baseMapper.getUserList(user);
   }

   /**
    * 根据用户id修改用户信息
    * @param user
    * @return
    */
   @Override
   public int updateUserPersonal(User user) {
      return baseMapper.updateById(user);
   }
}