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 8dda0faf45e40dd830f28f689bd47ab509762fe8..a5de496473a1de8382ca187b6fb08c65aab7cbd8 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 contactUser; + + /** + * 联系人邮箱 + */ + @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.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 70aa0a96237a5b2ca0c1b9a2d38a0b76a5e8b56b..20cded411cc14630aa0619e7188f1d95c528aeb4 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 contactUser; + + 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.contactUser = embeddedTenant.getContactUser(); + this.contactEmail = embeddedTenant.getContactEmail(); + this.extension = embeddedTenant.getExtension(); } }