From c21c161bc5ecddbe2a1d5174c2d178d768939e17 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 26 Jan 2024 09:56:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
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