Merge branch 'dev-mitao'

mitao

2024-05-27 f66cd5340a8c9a5264c82549f25e4d88cf2d815a

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java

copy from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java
copy to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java
File was copied from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.domain.pojo;
package com.ruoyi.auction.domain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,11 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.enums.BidStatusEnum;
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;
@@ -18,48 +16,29 @@

/**
 * <p>
 * 出价记录表
 * 用户收藏的普通拍卖商品
 * </p>
 *
 * @author mitao
 * @since 2024-05-16
 * @since 2024-05-27
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_auction_bid_record")
@ApiModel(value = "AuctionBidRecord对象", description = "出价记录表")
public class AuctionBidRecord implements Serializable {
@TableName("t_member_auction_collection")
@ApiModel(value = "MemberAuctionCollection对象", description = "用户收藏的普通拍卖商品")
public class MemberAuctionCollection implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "出价记录id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;
    private Integer id;

    @ApiModelProperty(value = "拍卖场id")
    private Long auctionSalesroomId;

    @ApiModelProperty(value = "商品id")
    private Long goodsSkuId;
    @ApiModelProperty(value = "收藏目标id")
    private Long targetId;

    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "商品名称")
    private String goodsSkuName;

    @ApiModelProperty(value = "最终出价时间")
    private LocalDateTime lastBidTime;

    @ApiModelProperty(value = "出价次数")
    private Integer bidCount;

    @ApiModelProperty(value = "最终出价金额")
    private BigDecimal lastBidAmount;

    @ApiModelProperty(value = "开始状态 0=淘汰 1=领先")
    private BidStatusEnum status;

    @ApiModelProperty(value = "创建者")
    @TableField(value = "create_by", fill = FieldFill.INSERT)