3bc00334ea
# Conflicts: # src/main/java/com/bao/dating/controller/PostController.java # src/main/java/com/bao/dating/controller/UserController.java # src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java # src/main/java/com/bao/dating/interceptor/TokenInterceptor.java # src/main/java/com/bao/dating/mapper/PostMapper.java # src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java # src/main/java/com/bao/dating/service/UserService.java # src/main/java/com/bao/dating/service/impl/PostServiceImpl.java # src/main/java/com/bao/dating/service/impl/UserServiceImpl.java