From f45bcaf01cd2c96e66b08d3f9b7287aa5b4cdab2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 四月 2026 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 773a95e..d8b5f77 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -337,7 +337,7 @@
@ExcelColumn(name = "寮傚父璐圭敤")
private Long exceptionAmount;
- @ApiModelProperty(value = "寮傚父琛ュ伩/琛ュ伩鍙告満锛堝垎锛�")
+ @ApiModelProperty(value = "寮傚父琛ュ伩鍙告満锛堝垎锛�")
@ExcelColumn(name = "寮傚父琛ュ伩")
private Long exceptionFee;
@@ -348,6 +348,10 @@
@ApiModelProperty(value = "缁撶畻鐘舵�侊細0=寰呯粨绠楋紱1=宸茬粨绠楋紱")
private Integer settlementStatus;
+ @ApiModelProperty(value = "缁撶畻鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date settlementTime;
+
@ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
private String outTradeNo;
--
Gitblit v1.9.3