From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffSuggestPageVo.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffSuggestPageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffSuggestPageVo.java
index 3969d41..3f355c4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffSuggestPageVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffSuggestPageVo.java
@@ -19,36 +19,39 @@
@ApiModelProperty(value = "建议id")
private Long suggestId;
- @Excel(name = "员工姓名", width = 30)
+ @Excel(name = "员工姓名", width = 30, sort = 1)
@ApiModelProperty(value = "员工姓名")
private String staffName;
- @Excel(name = "部门名称", width = 30)
+ @Excel(name = "部门名称", width = 30, sort = 2)
@ApiModelProperty(value = "部门名称")
private String deptName;
- @Excel(name = "手机号", width = 30)
- @ApiModelProperty("手机号")
+ @Excel(name = "员工手机号", width = 30, sort = 3)
+ @ApiModelProperty(value="手机号")
private String mobile;
- @Excel(name = "建议内容", width = 30)
+ @Excel(name = "建议内容", width = 30, sort = 4)
@ApiModelProperty(value = "建议内容")
private String suggestContent;
- @Excel(name = "回复内容", width = 30)
+ @Excel(name = "回复内容", width = 30, sort = 5)
@ApiModelProperty(value = "回复内容")
private String replayContent;
- @Excel(name = "建议状态", width = 30)
+ @Excel(name = "状态", width = 30, sort = 6)
@ApiModelProperty(value = "建议状态")
private String suggestStatus;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 7)
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @Excel(name = "回复人姓名", width = 30)
+ @Excel(name = "回复人", width = 30, sort = 8)
@ApiModelProperty(value = "回复人姓名")
private String replayUserName;
- @Excel(name = "回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "回复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 9)
@ApiModelProperty(value = "回复时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date replayTime;
- @Excel(name = "平台响应时间", width = 30)
+ @Excel(name = "响应时间", width = 30, sort = 10)
@ApiModelProperty(value = "平台响应时间")
private String responseTime;
+ @Excel(name = "标签", width = 30, sort = 11)
+ @ApiModelProperty(value = "建议标签")
+ private String suggestTags;
}
--
Gitblit v1.7.1