From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java
index 382db9b..4e8d862 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java
@@ -61,9 +61,11 @@
     @Excel(name = "平台响应时间", width = 30)
     @ApiModelProperty(value = "平台响应时间")
     private String responseTime;
-    @Excel(name = "回复商户名", width = 30)
-    @ApiModelProperty(value = "回复商户名")
-    private String replayShopName;
+    @ApiModelProperty(value = "商户id")
+    private Long shopId;
+    @Excel(name = "商户名", width = 30)
+    @ApiModelProperty(value = "商户名")
+    private String shopName;
     @Excel(name = "商户回复人姓名", width = 30)
     @ApiModelProperty(value = "商户回复人姓名")
     private String shopReplayUserName;

--
Gitblit v1.7.1