# Conflicts: # src/main/java/com/example/bean/User.java # src/main/resources/com/example/mapper/UserMapper.xml