From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
index f5fefde..2587ab1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
@@ -44,13 +44,30 @@
@ApiModelProperty(value = "������������")
- @JsonFormat(pattern="yyyy-MM-dd")
@ExcelProperty(value = "������������")
- private Date escalationTime;
+ private String escalationTimeStr;
+
+ @ExcelProperty(value = "������������")
+ private String unitName;
+
+ @ExcelProperty(value = "������������")
+ private String polluteTypeName;
@ApiModelProperty(value = "������������")
@ExcelProperty(value = "������������")
private String pollutePosition;
+
+ @ApiModelProperty(value = "������������id")
+ @ExcelProperty(value = "������������")
+ private String changeTypeStr;
+
+ @ApiModelProperty(value = "���������")
+ @ExcelProperty(value = "���������")
+ private String escalationName;
+
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String problemDescribe;
/* @ApiModelProperty(value = "������������")
private List<FileAddressVo> fileBaseList;*/
@@ -59,9 +76,25 @@
@ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
private List<String> writeCellDataFile;
- @ApiModelProperty(value = "���������")
- @ExcelProperty(value = "���������")
- private String escalationName;
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String changeStr;
+
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String changeDescribe;
+
+ @ApiModelProperty(value = "���������������")
+ @ExcelProperty(value = "���������������")
+ private String changeName;
+
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String changeTimeStr;
+
+
+ @ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
+ private List<String> writeCellDataFileResult;
/* @ApiModelProperty(value = "������������id")
private Integer unitId;
--
Gitblit v1.8.0