Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java

@@ -7,6 +7,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
public class AuctionSalesroomGoodsInfoVO {
@@ -106,6 +107,10 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
   private BigDecimal presentBid;

    @ApiModelProperty(value = "最高出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal zgBid;

    @ApiModelProperty(value = "最低加价金额")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal minimumMarkupAmount;
@@ -118,6 +123,7 @@
    @ApiModelProperty(value = "规格单位")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String specUnit;

    @ApiModelProperty(value = "商品说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String detail;
@@ -134,5 +140,12 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String explain;

    @ApiModelProperty(value = "商品信息")
    List<getHomeGoodsSkuXxiVO> xxiVOS;

    @ApiModelProperty("是否报名 1未报名，2 已报名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isApply;


}