From 86bfbc5bc92748f04d8c4c0c81fb57210ba83157 Mon Sep 17 00:00:00 2001 From: hanshuai03 <14693422+hanshuai03@user.noreply.gitee.com> Date: Thu, 29 Jan 2026 16:22:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E5=8F=8A=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenancy/api/entity/EmbeddedTenant.java | 28 +++++++++++++++++++ .../edp/caf/tenancy/api/entity/Tenant.java | 12 ++++++++ 2 files changed, 40 insertions(+) diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java index 8dda0faf4..108a89120 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java @@ -47,11 +47,39 @@ public class EmbeddedTenant implements Serializable { @Column private Date createdTime; + /** + * 是否启用 + */ + @Column + private boolean enabled; + + /** + * 联系人 + */ + @Column + private String contactName; + + /** + * 联系人邮箱 + */ + @Column + private String contactEmail; + + /** + * 扩展字段，emc界面自行组织json + */ + @Column + private String extension; + public EmbeddedTenant(){} public EmbeddedTenant(Tenant tenant){ this.id=tenant.getId(); this.code=tenant.getCode(); this.createdTime=tenant.getCreatedTime(); + this.enabled=tenant.isEnabled(); + this.contactName=tenant.getContactName(); + this.contactEmail=tenant.getContactEmail(); + this.extension=tenant.getExtension(); } } diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java index 70aa0a962..dcb6ac547 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java @@ -60,6 +60,14 @@ public class Tenant implements Serializable { private Date createdTime; + private boolean enabled; + + private String contactName; + + private String contactEmail; + + private String extension; + public Tenant(){} public Tenant(EmbeddedTenant embeddedTenant, String language) { @@ -67,6 +75,10 @@ public class Tenant implements Serializable { this.code = embeddedTenant.getCode(); this.name = embeddedTenant.getName() != null ? embeddedTenant.getName().getValue(language) : null; this.createdTime = embeddedTenant.getCreatedTime(); + this.enabled = embeddedTenant.isEnabled(); + this.contactName = embeddedTenant.getContactName(); + this.contactEmail = embeddedTenant.getContactEmail(); + this.extension = embeddedTenant.getExtension(); } } -- Gitee From 9bd2d5b3b534fc99d5568c1873467c482e52b243 Mon Sep 17 00:00:00 2001 From: hanshuai03 <14693422+hanshuai03@user.noreply.gitee.com> Date: Mon, 2 Feb 2026 15:20:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E5=8F=8A=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java | 4 ++-- .../main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java index 108a89120..a5de49647 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java @@ -57,7 +57,7 @@ public class EmbeddedTenant implements Serializable { * 联系人 */ @Column - private String contactName; + private String contactUser; /** * 联系人邮箱 @@ -78,7 +78,7 @@ public class EmbeddedTenant implements Serializable { this.code=tenant.getCode(); this.createdTime=tenant.getCreatedTime(); this.enabled=tenant.isEnabled(); - this.contactName=tenant.getContactName(); + this.contactUser=tenant.getContactUser(); this.contactEmail=tenant.getContactEmail(); this.extension=tenant.getExtension(); } diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java index dcb6ac547..20cded411 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java @@ -62,7 +62,7 @@ public class Tenant implements Serializable { private boolean enabled; - private String contactName; + private String contactUser; private String contactEmail; @@ -76,7 +76,7 @@ public class Tenant implements Serializable { this.name = embeddedTenant.getName() != null ? embeddedTenant.getName().getValue(language) : null; this.createdTime = embeddedTenant.getCreatedTime(); this.enabled = embeddedTenant.isEnabled(); - this.contactName = embeddedTenant.getContactName(); + this.contactUser = embeddedTenant.getContactUser(); this.contactEmail = embeddedTenant.getContactEmail(); this.extension = embeddedTenant.getExtension(); } -- Gitee