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 |   22 ++++++++++++++++++++++
 1 files changed, 22 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 f6476d4..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
@@ -1,7 +1,9 @@
 package org.jeecg.modules.eam.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.entity.JeecgEntity;
@@ -15,6 +17,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -38,6 +41,9 @@
 	@Dict(dicCode = "dept")
 	private String deptId;
 
+	@ApiModelProperty(value = "缁翠慨鐝粍ids")
+	private String teamId;
+
 	@ApiModelProperty(value = "澶囨敞")
 	private String remark;
 
@@ -49,4 +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