From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
index 55be5cb..e26d9be 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
@@ -1,15 +1,25 @@
 package com.ruoyi.system.api.domain.dto;
 
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Set;
 
 @Data
+@ApiModel(value = "拍卖会我的里面筛选条件传输对象", description = "拍卖会我的里面筛选条件传输对象")
 public class MemberAuctionSalesroomWdDTO {
     @ApiModelProperty(value = "会员id")
     private Long memberId;
 
     @ApiModelProperty(value = "拍卖会id")
     private  Set<Long> goodsSkuIdList;
+
+    @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束 4=全部")
+    private Integer status;
+
+    @ApiModelProperty(value = "拍卖场名称")
+    private  String salesroomName;
+
 }

--
Gitblit v1.7.1