Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -92,5 +92,8 @@
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "结束时间")
    private LocalDateTime endTime;


}