Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -11,6 +11,11 @@
import java.time.LocalDateTime;
@Data
public class WdMemberAuctionSalesroomVO {

    @ApiModelProperty(value = "拍卖场id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long id;

    @ApiModelProperty(value = "拍卖场id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long SalesroomId;