From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtOperLogPageVo.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtOperLogPageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtOperLogPageVo.java
index 13454d3..b0eca77 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtOperLogPageVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtOperLogPageVo.java
@@ -17,19 +17,19 @@
@Data
public class MgtOperLogPageVo {
- @Excel(name = "操作内容", width = 30)
+ @Excel(name = "操作内容", width = 30,sort = 5)
@ApiModelProperty(value = "操作内容")
private String operContent;
- @Excel(name = "操作类型", width = 30)
+ @Excel(name = "操作类型", width = 30,sort = 2)
@ApiModelProperty(value = "操作类型")
private String operTitle;
- @Excel(name = "操作IP", width = 30)
+ @Excel(name = "操作IP", width = 30,sort = 4)
@ApiModelProperty(value = "操作IP")
private String operIp;
- @Excel(name = "操作人员", width = 30)
+ @Excel(name = "操作人员", width = 30,sort = 3)
@ApiModelProperty(value = "操作人员")
private String operName;
- @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 1)
@ApiModelProperty(value = "操作时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date operTime;
--
Gitblit v1.7.1