Conflicts: mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java mallinkService/src/main/resources/mapper/WxCUserMapper.xml