Merge branch 'feature/2020-1104-混合支付' into qa

6a29c35b · xiaoer.li@freemud.com · 1d51c561 · 00ab1772 · 6a29c35b
Commit 6a29c35b authored Nov 18, 2020 by xiaoer.li@freemud.com
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java
+1 -1

No files found.
--- a/ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java
+++ b/ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java
@@ -22,7 +22,7 @@ public  class PayItem {
    private String partnerId;
    private String fmTradeNo;
    private Integer payChannelType;
-    private Integer payChannelName;
+    private String payChannelName;
    private String transId;
    private String orderPayItemCode;
    private String outOrderNo;