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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 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
new file mode 100644
index 0000000..2d0571f
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationExcelExt.java
@@ -0,0 +1,51 @@
+package com.moral.api.pojo.ext.allocation;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.moral.api.entity.Allocation;
+import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
+import com.moral.api.pojo.vo.file.FileAddressVo;
+import com.moral.api.pojo.vo.file.FileVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ * deyt template generate
+ * @author JI
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AllocationExcelExt extends Allocation {
+
+ @ApiModelProperty(value = "������������")
+ private List<FileAddressVo> fileBaseList;
+
+ @ApiModelProperty(value = "������������")
+ private List<FileAddressVo> fileChangeList;
+
+ /* @ApiModelProperty(value = "������������")
+ private List<FileVo> fileApproveList;
+
+ @ApiModelProperty(value = "������������")
+ private List<ApproveTableListVo> approveList;*/
+
+ //������������������
+ @TableField(exist = false)
+ private String unitName;
+
+ //������������������
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ //������������������
+ private String polluteTypeName;
+
+}
--
Gitblit v1.8.0