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

@@ -106,6 +106,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;