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/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