From 168b8baf0147c0c8f9f49d6f024a86c3b3e47b22 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 09 六月 2025 10:21:43 +0800
Subject: [PATCH] Merge branch 'dev-1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-1.3
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index f2ab0af..3cad7a6 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -286,7 +286,7 @@
/// <summary>
/// 瀹為檯鍒拌处閲戦
/// </summary>
- public decimal ActualReceivedAmount { get; set; }
+ public decimal? ActualReceivedAmount { get; set; }
public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
@@ -532,6 +532,9 @@
[Name("瀹屾垚鏃堕棿")]
public string? FinishTimeStr { get; set; }
+
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
}
@@ -1444,7 +1447,7 @@
/// <summary>
/// 缁撶畻鏃堕棿
/// </summary>
- public DateTime FinishTime { get; set; }
+ public DateTime? FinishTime { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -1508,7 +1511,7 @@
/// <summary>
/// 缁撶畻鏃堕棿
/// </summary>
- public DateTime FinishTime { get; set; }
+ public DateTime? FinishTime { get; set; }
[Name("缁撶畻鏃堕棿")]
public string FinishTimeStr { get; set; }
--
Gitblit v1.9.1