From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
index c4270a7..c73d58e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
@@ -1,10 +1,12 @@
 package com.ruoyi.system.api.domain.dto;
 
 import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "拍卖会传输对象", description = "拍卖会传输对象")
 public class MemberAuctionSalesroomDTO extends BasePage {
     @ApiModelProperty(value = "会员id")
     private Long memberId;
@@ -17,4 +19,8 @@
 
     @ApiModelProperty(value = "拍卖场编号")
     private  String salesroomNO;
+
+    @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束 4=全部")
+    private Integer status;
+
 }

--
Gitblit v1.7.1