# Conflicts: # mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java # mallinkService/src/main/java/com/iformall/service/WxOrderService.java # mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java # mallinkService/src/main/resources/mapper/WxOrderMapper.xml