From b876f27c592c5d44e4b32b79d4ef4bc25fe88603 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 20 七月 2025 15:21:04 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/Order.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Order.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Order.java
index 7475d90..a62221a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Order.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Order.java
@@ -71,4 +71,23 @@
@TableField(value = "commission_platform")
@ApiModelProperty(value = "平台分佣金额")
private BigDecimal commissionPlatform;
+
+ @TableField(value = "finish_time")
+ @ApiModelProperty(value = "完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime finishTime;
+
+ @TableField(value = "finish_time")
+ @ApiModelProperty(value = "完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sellerFinishTime;
+
+ @TableField("is_refund")
+ @ApiModelProperty("是否退款（1是，0-否）")
+ private Integer isRefund;
+
+ @TableField(value = "refund_time")
+ @ApiModelProperty(value = "退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime refundTime;
}
\ No newline at end of file
--
Gitblit v1.7.1