From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 26 八月 2024 11:43:59 +0800 Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index 3185423..69be547 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -2,17 +2,17 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysPost; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; import java.util.Date; - - /** * 宀椾綅淇℃伅瑙嗗浘瀵硅薄 sys_post @@ -34,6 +34,12 @@ private Long postId; /** + * 閮ㄩ棬id + */ + @ExcelProperty(value = "閮ㄩ棬id") + private Long deptId; + + /** * 宀椾綅缂栫爜 */ @ExcelProperty(value = "宀椾綅缂栫爜") @@ -46,6 +52,12 @@ private String postName; /** + * 宀椾綅绫诲埆缂栫爜 + */ + @ExcelProperty(value = "绫诲埆缂栫爜") + private String postCategory; + + /** * 鏄剧ず椤哄簭 */ @ExcelProperty(value = "宀椾綅鎺掑簭") @@ -54,7 +66,7 @@ /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ - @ExcelProperty(value = "鐘舵��", index = 4, converter = ExcelDictConvert.class) + @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_normal_disable") private String status; @@ -70,4 +82,10 @@ @ExcelProperty(value = "鍒涘缓鏃堕棿") private Date createTime; + /** + * 閮ㄩ棬鍚� + */ + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId") + private String deptName; + } -- Gitblit v1.9.3