src/main/java/com/lanren/huhu/partner/service/UserAgentService.java · 14660b73672727df12f54e6978cccf80c5ebb578 · guanchen / huhu-partner

Merge commit '' into guanchen · 14660b73

authored Jul 24, 2019

# 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

14660b73

UserAgentService.java 571 Bytes

Replace UserAgentService.java