From 1bea61102b935d0d5acd3a5ce8f441452a86ff4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java
index 1f96972..0577669 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java
@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,8 +42,14 @@
@ApiModelProperty(value = "拍卖场id")
private Long auctionSalesroomId;
- @ApiModelProperty(value = "商品id")
- private Long goodsSkuId;
+ @ApiModelProperty(value = "拍卖商品id")
+ private Long auctionGoodsId;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal bond;
@ApiModelProperty(value = "是否缴纳保证金")
private Boolean boundStatus;
@@ -66,6 +73,11 @@
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
+ private Integer paymentMethod;
+
+ @ApiModelProperty(value = "保证金订单编号")
+ private String orderNo;
}
--
Gitblit v1.7.1