From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.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/TradePayOffData.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java
index c6d1f96..a09e932 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java
@@ -15,6 +15,10 @@
 	 */
 	private String partnerId;
 	/**
+	 * 超时时间
+	 */
+	private String timeout;
+	/**
 	 * 场景标识。交通场景传”TRAFFIC”
 	 */
 	private String scene;

--
Gitblit v1.7.1