From 82de609c0b76d37d1a5044a631ddc1577374cdfa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
index ba971f8..9a517b0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
@@ -69,7 +69,7 @@
private LocalDateTime createTime;
@ApiModelProperty(value = "更新者")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@ApiModelProperty(value = "更新时间")
@@ -79,6 +79,8 @@
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
@TableLogic
private Integer delFlag;
+
+
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
private PaymentMethodEnum paymentMethod;
@@ -86,4 +88,7 @@
private String orderNo;
+ @ApiModelProperty("失效时间")
+ private LocalDateTime orderTimeSx;
+
}
--
Gitblit v1.7.1