From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 24 一月 2024 15:10:32 +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/MgtMemberIntegralPageVo.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberIntegralPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberIntegralPageVo.java index 0287b5a..fa1474f 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberIntegralPageVo.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberIntegralPageVo.java @@ -21,20 +21,20 @@ @ApiModelProperty(value = "记录id") private Long recordId; - @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 createTime; - @Excel(name = "变动积分", width = 30) + @Excel(name = "变动积分", width = 30, sort = 3) @ApiModelProperty(value = "变动积分") private Integer changeIntegral; - @Excel(name = "剩余积分", width = 30) + @Excel(name = "剩余积分", width = 30, sort = 4) @ApiModelProperty(value = "剩余积分") private Integer surpIntegral; - @Excel(name = "变动理由", width = 30) + @Excel(name = "变动理由", width = 30, sort = 2) @ApiModelProperty(value = "变动理由") private String changeReason; } -- Gitblit v1.7.1