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/Team.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
index f6fa6c8..be67a12 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
@@ -5,11 +5,13 @@
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -112,5 +114,8 @@
/**鎵�灞為儴闂�*/
@Excel(name = "鎵�灞為儴闂�", width = 15)
@ApiModelProperty(value = "鎵�灞為儴闂�")
+ @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String departId;
+ @TableField(exist = false)
+ private String noEqId;
}
--
Gitblit v1.9.3