From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java
index 054efb6..4ff2cd7 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java
@@ -1,12 +1,13 @@
package com.ruoyi.auction.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,9 +44,6 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
- @ApiModelProperty(value = "商品名称")
- private String goodsSkuName;
-
@ApiModelProperty(value = "起拍价格")
private BigDecimal startingPrice;
@@ -53,9 +51,10 @@
private BigDecimal minimumMarkupAmount;
@ApiModelProperty(value = "拍品数量")
- private Integer itemQuantity;
+ private Integer salesroomStock;
@ApiModelProperty(value = "兜底成交个数")
+ @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
private Integer guaranteedTradeVolume;
@ApiModelProperty(value = "拍卖时间（分钟）")
@@ -70,8 +69,8 @@
@ApiModelProperty(value = "开始时间")
private LocalDateTime startTime;
- @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
- private AuctionStartStatusEnum status;
+ @ApiModelProperty(value = "状态 0=等待中 1=进行中 2=已结束")
+ private AuctionGoodsStatusEnum status;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
@@ -82,7 +81,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 = "更新时间")
@@ -93,5 +92,8 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "结束时间")
+ private LocalDateTime endTime;
+
}
--
Gitblit v1.7.1