From 00cf6c13531447af59a8d2121bbfb1a3a1f68c0d Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期五, 06 六月 2025 09:15:29 +0800 Subject: [PATCH] Merge branch 'main' of http://lanpucloud.cn:1111/r/eims-master --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java index 352a83d..0f2ebf2 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureVo.java @@ -92,16 +92,22 @@ /** * 浣跨敤閮ㄩ棬 */ + private Long useDept; + @ExcelProperty(value = "浣跨敤閮ㄩ棬") @ColumnWidth(20) - private Long useDept; + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "useDept") + private String useDeptName; /** * 绠$悊浜� */ + private Long manageUser; + @ExcelProperty(value = "绠$悊浜�") @ColumnWidth(12) - private Long manageUser; + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "manageUser") + private String manageUserName; /** * 閲囪喘鏃ユ湡 -- Gitblit v1.9.3