From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 c932bcd..be41660 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
@@ -84,8 +84,8 @@
@ExcelProperty(value = "������������")
private String changeDescribe;
- @ApiModelProperty(value = "���������������")
- @ExcelProperty(value = "���������������")
+ @ApiModelProperty(value = "���������������")
+ @ExcelProperty(value = "���������������")
private String changeName;
@ApiModelProperty(value = "������������")
@@ -96,6 +96,14 @@
@ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
private List<String> writeCellDataFileResult;
+ @ApiModelProperty(value = "������")
+ @ExcelProperty(value = "������������")
+ private String stateStr;
+
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String checkDescribe;
+
/* @ApiModelProperty(value = "������������id")
private Integer unitId;
--
Gitblit v1.8.0