Conflicts: mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java