From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Area.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Area.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Area.java
index ee25f05..a9c7f4e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Area.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Area.java
@@ -17,6 +17,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -54,8 +55,20 @@
 	@TableLogic
 	private Integer delFlag = CommonConstant.DEL_FLAG_0;
 
+	/**鐖秈d*/
+	@Excel(name = "鐖秈d", width = 15)
+	@ApiModelProperty(value = "鐖秈d")
+	private String parentId;
+
+	/**1涓績锛�2宸ュ尯锛�3宸ユ*/
+	@ApiModelProperty(value = "1涓績锛�2宸ュ尯锛�3宸ユ")
+	private String type;
+
 	@TableField(exist = false)
 	private String teamNames;
 
+	@TableField(exist = false)
+	private List<Area> nextAreas;
+
 
 }
\ No newline at end of file

--
Gitblit v1.9.3