From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题(不含物料颜色字段)

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
index 27f5778..371b63c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.hrm.controller.admin.approval.vo;
 
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,81 +12,98 @@
 
 @Schema(description = "绠$悊鍚庡彴 - 绂昏亴鐢宠 Response VO")
 @Data
+@ExcelIgnoreUnannotated
 public class HrmResignationApplicationRespVO {
 
     @Schema(description = "鐢宠ID", example = "1")
     private Long id;
 
     @Schema(description = "鐢宠鍗曞彿", example = "RA202401001")
+    @ExcelProperty("鐢宠鍗曞彿")
     private String no;
 
     @Schema(description = "鐢宠浜篒D", example = "1")
     private Long userId;
 
     @Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
+    @ExcelProperty("鐢宠浜�")
     private String userName;
 
     @Schema(description = "閮ㄩ棬ID", example = "1")
     private Long deptId;
 
     @Schema(description = "閮ㄩ棬鍚嶇О", example = "鐮斿彂閮�")
+    @ExcelProperty("閮ㄩ棬")
     private String deptName;
 
     @Schema(description = "绂昏亴绫诲瀷", example = "1")
     private Integer resignationType;
 
     @Schema(description = "绂昏亴绫诲瀷鍚嶇О", example = "涓诲姩绂昏亴")
+    @ExcelProperty("绂昏亴绫诲瀷")
     private String resignationTypeName;
 
     @Schema(description = "棰勮绂昏亴鏃ユ湡", example = "2024-02-01")
+    @ExcelProperty("鏈熸湜绂昏亴鏃ユ湡")
     private LocalDate expectedDate;
 
     @Schema(description = "瀹為檯绂昏亴鏃ユ湡", example = "2024-02-01")
+    @ExcelProperty("瀹為檯绂昏亴鏃ユ湡")
     private LocalDate actualDate;
 
     @Schema(description = "绂昏亴鍘熷洜", example = "涓汉鍙戝睍")
+    @ExcelProperty("绂昏亴鍘熷洜")
     private String reason;
 
     @Schema(description = "浜ゆ帴浜篒D", example = "1")
     private Long handoverUserId;
 
     @Schema(description = "浜ゆ帴浜哄鍚�", example = "鏉庡洓")
+    @ExcelProperty("浜ゆ帴浜�")
     private String handoverUserName;
 
     @Schema(description = "浜ゆ帴鐘舵��", example = "0")
     private Integer handoverStatus;
 
     @Schema(description = "浜ゆ帴鐘舵�佸悕绉�", example = "鏈紑濮�")
+    @ExcelProperty("浜ゆ帴鐘舵��")
     private String handoverStatusName;
 
     @Schema(description = "浜ゆ帴璇存槑", example = "浜ゆ帴璇存槑")
+    @ExcelProperty("浜ゆ帴璇存槑")
     private String handoverRemark;
 
     @Schema(description = "瀹℃壒鐘舵��", example = "0")
     private Integer status;
 
     @Schema(description = "瀹℃壒鐘舵�佸悕绉�", example = "鑽夌")
+    @ExcelProperty("鐘舵��")
     private String statusName;
 
     @Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
     private Long reviewerId;
 
     @Schema(description = "瀹℃牳浜哄鍚�", example = "寮犱笁")
+    @ExcelProperty("瀹℃牳浜�")
     private String reviewerName;
 
     @Schema(description = "瀹℃牳鏃堕棿", example = "2024-01-01 10:00:00")
+    @ExcelProperty("瀹℃牳鏃堕棿")
     private LocalDateTime reviewTime;
 
     @Schema(description = "瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "鍚屾剰")
+    @ExcelProperty("瀹℃牳鎰忚")
     private String reviewRemark;
 
     @Schema(description = "瀹℃壒瀹屾垚鏃堕棿", example = "2024-01-01 10:00:00")
+    @ExcelProperty("瀹℃壒閫氳繃鏃堕棿")
     private LocalDateTime approveTime;
 
     @Schema(description = "闄勪欢鍒楄〃")
     private List<StorageBlobRespDTO> attachmentList;
 
     @Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
+    @ExcelProperty("澶囨敞")
     private String remark;
 
     @Schema(description = "鍒涘缓鏃堕棿", example = "2024-01-01 09:00:00")

--
Gitblit v1.9.3