Merge branch 'master' into dev-mitao

mitao

2024-05-17 14f8be1a86a3d852b92665fcf4c767478c3e12d2

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java

@@ -64,6 +64,12 @@
    @ApiModelProperty(value = "设为备选")
    private Boolean backupStatus;

    @ApiModelProperty(value = "排序")
    private Integer sortNum;

    @ApiModelProperty(value = "开始时间")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
    private AuctionStartStatusEnum status;