From e998c057be6d077dcec169ab4cb34f4755932601 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 13 八月 2025 15:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java
index fa53305..288fa67 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java
@@ -28,6 +28,10 @@
*/
private String partnerId;
/**
+ * 超时时间
+ */
+ private String timeout;
+ /**
* 结算信息json串。其中结算分账标识（profitSharing：0：不分账，1：分账）、是否推广单标识（isPromote：1、是、0、否）必传。例：{"profitSharing":"0",”isPromote”:”0”}
*/
private String field1;
--
Gitblit v1.7.1