# Conflicts: # src/main/java/com/bao/dating/config/WebConfig.java # src/main/java/com/bao/dating/controller/UserController.java # src/main/java/com/bao/dating/mapper/UserMapper.java # src/main/java/com/bao/dating/service/UserService.java # src/main/java/com/bao/dating/service/impl/UserServiceImpl.java # src/main/resources/com/bao/dating/mapper/UserMapper.xml