From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
index d9472b7..941fae9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtMemberSuggestPageDto.java
@@ -4,8 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @ClassName MgtMemberSuggestPageDto
  * @Description TODO
@@ -60,4 +58,7 @@
 
     @ApiModelProperty(value = "商户id集合",hidden = true)
     private String shopIds;
+
+    @ApiModelProperty(value = "建议类型1平台响应正序2平台响应倒序3商户响应正序4商户响应倒序")
+    private Integer suggestSort;
 }

--
Gitblit v1.7.1