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 | 8 ++++++--
1 files changed, 6 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 5238ee0..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
@@ -65,6 +65,10 @@
@ExcelProperty(value = "���������")
private String escalationName;
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String problemDescribe;
+
/* @ApiModelProperty(value = "������������")
private List<FileAddressVo> fileBaseList;*/
@@ -80,8 +84,8 @@
@ExcelProperty(value = "������������")
private String changeDescribe;
- @ApiModelProperty(value = "���������������")
- @ExcelProperty(value = "���������������")
+ @ApiModelProperty(value = "���������������")
+ @ExcelProperty(value = "���������������")
private String changeName;
@ApiModelProperty(value = "������������")
--
Gitblit v1.8.0