Merge remote-tracking branch 'origin/master'

mitao

2024-07-15 82de609c0b76d37d1a5044a631ddc1577374cdfa

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

@@ -42,7 +42,7 @@

    @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private AuctionGoodsStatusEnum goodsSkustatus;
    private Integer goodsSkustatus;

    @ApiModelProperty(value = "拍卖时间（分钟）")
    @JsonInclude(JsonInclude.Include.ALWAYS)