Conflicts: mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java mallinkService/src/main/resources/mapper/WxBusinessMapper.xml