Skip to content

Develop #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarywang merged 17 commits into from
Feb 19, 2021
Merged

Develop #2004

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0afb32e
fix:字段错误
Oct 12, 2020
af5950e
Merge remote-tracking branch 'wechat/develop' into develop
Oct 12, 2020
71cf14b
Merge remote-tracking branch 'wechat/develop' into develop
Oct 17, 2020
df6c7d3
Merge remote-tracking branch 'wechat/develop' into develop
Oct 28, 2020
b9f83ba
Merge remote-tracking branch 'wechat/develop' into develop
Nov 2, 2020
3038202
Merge remote-tracking branch 'wechat/develop' into develop
Nov 9, 2020
f0116a3
Merge remote-tracking branch 'wechat/develop' into develop
Nov 23, 2020
e4975c0
Merge remote-tracking branch 'origin/develop' into develop
Dec 29, 2020
8f69b09
Merge remote-tracking branch 'wechat/develop' into develop
Dec 29, 2020
29d2862
Merge remote-tracking branch 'wechat/develop' into develop
Dec 30, 2020
ad919f2
Merge remote-tracking branch 'wechat/develop' into develop
Jan 8, 2021
4d0a8bb
fix: issue#1940 对list和array属性字段加密
Jan 8, 2021
05540a3
fix: issue#1940 对list和array属性字段加密
Jan 8, 2021
508d3bd
fix: issue#1923 电商收付通，添加分账接收方，删除分账接收方
Jan 13, 2021
daf5c88
Merge remote-tracking branch 'wechat/develop' into develop
Jan 13, 2021
15612f5
Merge remote-tracking branch 'wechat/develop' into develop
Feb 19, 2021
212de81
fix:电商收付通 二级商户进件，部分字段加密
Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix:字段错误
  • Loading branch information
曾浩 committed Oct 12, 2020
commit 0afb32e1925110aa0cdcdc8f8c9b3fe5f7a44dc2
6 changes: 3 additions & 3 deletions weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ public class RefundsRequest implements Serializable {
/**
* <pre>
* 字段名：商户订单号
* 变量名：out_order_no
* 变量名：out_trade_no
* 是否必填：与transaction_id二选一
* 类型：string（64）
* 描述：
* 原支付交易对应的商户订单号。
* 示例值：P20150806125346
* </pre>
*/
@SerializedName(value = "out_order_no")
private String outOrderNo;
@SerializedName(value = "out_trade_no")
private String outTradeNo;

/**
* <pre>
Expand Down