From 94014e38424537e2eff27423f2dc29d3016a8f17 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 13:56:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
index d406a10..9fcdd20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.vo.system;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
import com.ruoyi.system.model.TProjectDept;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,9 +13,11 @@
@ApiModel(value = "任务报表VO")
public class ProjectDeptDetailsVO {
- @ApiModelProperty("片区")
- private List<ProjectDeptDetailsChildVO> projectChild;
- @ApiModelProperty("项目名称")
+ @ApiModelProperty("项目")
+ @Excel(name = "项目", width = 20,needMerge = true)
private String projectName;
+ @ApiModelProperty("片区")
+ @ExcelCollection(name = "片区")
+ private List<ProjectDeptDetailsChildVO> projectChild;
}
--
Gitblit v1.7.1