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/ext/allocation/AllocationExcelExt.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExcelExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExcelExt.java
index a73cc6d..2d0571f 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExcelExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExcelExt.java
@@ -28,10 +28,10 @@
@ApiModelProperty(value = "������������")
private List<FileAddressVo> fileBaseList;
- /* @ApiModelProperty(value = "������������")
- private List<FileVo> fileChangeList;
+ @ApiModelProperty(value = "������������")
+ private List<FileAddressVo> fileChangeList;
- @ApiModelProperty(value = "������������")
+ /* @ApiModelProperty(value = "������������")
private List<FileVo> fileApproveList;
@ApiModelProperty(value = "������������")
--
Gitblit v1.8.0