From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:13:02 +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/MgtMemberBrowsePageVo.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberBrowsePageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberBrowsePageVo.java
index 036a9c0..39d68f4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberBrowsePageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberBrowsePageVo.java
@@ -17,20 +17,20 @@
@Data
public class MgtMemberBrowsePageVo {
- @Excel(name = "浏览类型", width = 30)
+ @Excel(name = "浏览类型", width = 30, sort = 1)
@ApiModelProperty(value = "浏览类型1鸿瑞学堂2营销活动3商城商品4关于鸿瑞堂5申请加盟")
private String browseType;
- @Excel(name = "浏览名称", width = 30)
+ @Excel(name = "浏览名称", width = 30, sort = 2)
@ApiModelProperty(value = "浏览名称")
private String browseName;
- @Excel(name = "浏览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "浏览时间")
+ @Excel(name = "停留时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 3)
+ @ApiModelProperty(value = "停留时间")
private String browseTime;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "创建时间")
+ @Excel(name = "浏览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 4)
+ @ApiModelProperty(value = "浏览时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
}
--
Gitblit v1.7.1