From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-personnel/src/main/java/com/ruoyi/personnel/dto/TrainingRecordExportDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/TrainingRecordExportDto.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/TrainingRecordExportDto.java
index 320af2a..377403f 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/TrainingRecordExportDto.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/dto/TrainingRecordExportDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.personnel.dto;
+import com.deepoove.poi.data.PictureRenderData;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,7 +12,7 @@
public class TrainingRecordExportDto {
@ApiModelProperty("鐢ㄦ埛鍚嶇О1")
- private String userName1;
+ private PictureRenderData userNameRender1;
@ApiModelProperty("閮ㄩ棬1")
private String department1;
@@ -20,7 +21,7 @@
private String examinationResults1;
@ApiModelProperty("鐢ㄦ埛鍚嶇О2")
- private String userName2;
+ private PictureRenderData userNameRender2;
@ApiModelProperty("閮ㄩ棬1")
private String department2;
@@ -29,4 +30,7 @@
private String examinationResults2;
+
+
+
}
--
Gitblit v1.9.3