From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberSuggestPageVo.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 1dade07..c52e207 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
@@ -26,57 +26,57 @@
@Excel(name = "用户昵称", width = 30, sort = 1)
@ApiModelProperty(value = "用户昵称")
private String userNickName;
- @Excel(name = "用户性别", width = 30, sort = 3)
+ @Excel(name = "性别", width = 30, sort = 3)
@ApiModelProperty(value = "用户性别")
private String gender;
- @Excel(name = "用户手机", width = 30, sort = 4)
+ @Excel(name = "用户手机号", width = 30, sort = 4)
@ApiModelProperty(value = "用户手机")
private String userMobile;
@Excel(name = "建议类型", width = 30, sort = 5)
@ApiModelProperty(value = "建议类型1.平台2.门店")
private String suggestType;
- @Excel(name = "建议内容", width = 30, sort = 6)
+ @Excel(name = "建议内容", width = 30, sort = 7)
@ApiModelProperty(value = "建议内容")
private String suggestContent;
- @Excel(name = "平台回复内容", width = 30, sort = 8)
+ @Excel(name = "平台回复内容", width = 30, sort = 9)
@ApiModelProperty(value = "平台回复内容")
private String replayContent;
- @Excel(name = "商户回复内容", width = 30, sort = 7)
+ @Excel(name = "店铺回复内容", width = 30, sort = 8)
@ApiModelProperty(value = "商户回复内容")
private String shopReplayContent;
- @Excel(name = "建议状态", width = 30, sort = 9)
+ @Excel(name = "状态", width = 30, sort = 10)
@ApiModelProperty(value = "建议状态")
private String suggestStatus;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 10)
+ @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 11)
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @Excel(name = "平台回复人", width = 30, sort = 11)
+ @Excel(name = "平台回复人", width = 30, sort = 12)
@ApiModelProperty(value = "回复人姓名")
private String replayUserName;
- @Excel(name = "平台回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 13)
+ @Excel(name = "平台回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 14)
@ApiModelProperty(value = "回复时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date replayTime;
- @Excel(name = "平台响应时间", width = 30, sort = 15)
+ @Excel(name = "平台响应时间", width = 30, sort = 16)
@ApiModelProperty(value = "平台响应时间")
private String responseTime;
@ApiModelProperty(value = "商户id")
private Long shopId;
- @Excel(name = "商户名", width = 30)
+ @Excel(name = "店铺名称", width = 30, sort = 6)
@ApiModelProperty(value = "商户名")
private String shopName;
- @Excel(name = "商户回复人", width = 30, sort = 12)
+ @Excel(name = "店铺回复人", width = 30, sort = 13)
@ApiModelProperty(value = "商户回复人姓名")
private String shopReplayUserName;
- @Excel(name = "商户回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 14)
+ @Excel(name = "店铺回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 15)
@ApiModelProperty(value = "商户回复时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date shopReplayTime;
- @Excel(name = "商户响应时间", width = 30, sort = 16)
+ @Excel(name = "店铺响应时间", width = 30, sort = 17)
@ApiModelProperty(value = "商户响应时间")
private String shopResponseTime;
- @Excel(name = "建议标签", width = 30, sort = 17)
+ @Excel(name = "建议标签", width = 30, sort = 18)
@ApiModelProperty(value = "建议标签")
private String suggestTags;
--
Gitblit v1.7.1