# Conflicts: # src/main/java/com/lanren/huhu/partner/controller/UserController.java # src/main/java/com/lanren/huhu/partner/dao/PartnerAccountMapper.java # src/main/java/com/lanren/huhu/partner/dao/UserAgentMapper.java # src/main/java/com/lanren/huhu/partner/service/impl/UserServiceImpl.java # src/main/resources/mapper/PartnerAccountMapper.xml # src/main/resources/mapper/UserAgentMapper.xml
