From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index b4fdad5..d89bdd7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -87,6 +87,14 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ /**浣跨敤閮ㄩ棬缂栫爜*/
+ @TableField(exist = false)
+ private String useDepartNum;
+
+ /**缁翠慨閮ㄩ棬缂栫爜*/
+ @TableField(exist = false)
+ private String repairDepartNum;
+
//update-begin---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁璐熻矗浜篿ds鍜屾棫鐨勮礋璐ｄ汉ids
/**閮ㄩ棬璐熻矗浜虹殑ids*/
@TableField(exist = false)
@@ -130,6 +138,8 @@
Objects.equals(createBy, depart.createBy) &&
Objects.equals(createTime, depart.createTime) &&
Objects.equals(updateBy, depart.updateBy) &&
+ Objects.equals(useDepartNum, depart.useDepartNum) &&
+ Objects.equals(repairDepartNum, depart.repairDepartNum) &&
Objects.equals(updateTime, depart.updateTime);
}
@@ -142,6 +152,6 @@
return Objects.hash(super.hashCode(), id, parentId, departName,
departNameEn, departNameAbbr, departOrder, description,orgCategory,
orgType, orgCode, mobile, fax, address, memo, status,
- delFlag, createBy, createTime, updateBy, updateTime);
+ delFlag, createBy, createTime, updateBy, updateTime,useDepartNum,repairDepartNum);
}
}
--
Gitblit v1.9.3