Merge remote-tracking branch 'origin/master'

mitao

2024-06-21 c6602babed46a20a8db218bd20d566a67c51d4ed

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

@@ -86,6 +86,14 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String album;

    @ApiModelProperty(value = "分享标题")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String shareTitle;

    @ApiModelProperty(value = "分享图片")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String sharePic;

    @ApiModelProperty(value = "是否出价 1未出价，2出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isBond;
@@ -97,6 +105,10 @@
    @ApiModelProperty(value = "当前出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
   private BigDecimal presentBid;

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

    @ApiModelProperty(value = "最低加价金额")
    @JsonInclude(JsonInclude.Include.ALWAYS)
@@ -122,7 +134,9 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderNo;


    @ApiModelProperty(value = "商品说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String explain;


}