From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 14 Dec 2023 15:38:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java | 4 ++-- 1 files changed, 2 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..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 @@ -84,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