Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

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

@@ -92,4 +92,17 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String years;

    @ApiModelProperty(value = "最低加价金额")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal minimumMarkupAmount;

    @ApiModelProperty(value = "当前出价")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal presentBid;

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


}