GeezerVisonThe World Wide Web, restored to 800 pixels of glory. | ||
| Home|About|Gaming cabinet|Archives|How it works|Starter sites | ||
GeezerVison is showing github.com — 支付营销代金券核销回调参数解析和支付智慧商圈接口 by thinsstar · Pull Request #2022 · binarywang/WxJava Conversation
|
|
有冲突,请先解决下 |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
# Conflicts: # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCallbacksSaveResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsCreateResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsQueryResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateRequest.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksCreateResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksFlowGetResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksItemsGetResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksMerchantsGetResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksQueryResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksStartResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MarketingFavorService.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MarketingFavorServiceImpl.java
已解决冲突 |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
Successfully merging this pull request may close these issues.
There was an error while loading. Please reload this page.