From fbe37e2e00bddec409b595a4a6e50c4bb32a008a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 三月 2023 18:29:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
index c5e3f32..2822469 100644
--- a/Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
+++ b/Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
@@ -17,7 +17,6 @@
package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import io.swagger.annotations.ApiModel;
@@ -25,10 +24,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
/**
* 瀹炰綋绫�
@@ -36,7 +31,7 @@
* @author Chill
*/
@Data
-@TableName("blade_tenant")
+@TableName("pl_org_tenant")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Tenant瀵硅薄", description = "Tenant瀵硅薄")
public class Tenant extends BaseEntity {
@@ -48,6 +43,13 @@
*/
@ApiModelProperty(value = "绉熸埛ID")
private String tenantId;
+
+ /**
+ * 绉熸埛鍏ㄧО
+ */
+ @ApiModelProperty(value = "绉熸埛鍏ㄧО")
+ private String fullName;
+
/**
* 绉熸埛鍚嶇О
*/
@@ -78,18 +80,7 @@
*/
@ApiModelProperty(value = "鑱旂郴鍦板潃")
private String address;
- /**
- * 璐﹀彿棰濆害
- */
- @ApiModelProperty(value = "璐﹀彿棰濆害")
- private Integer accountNumber;
- /**
- * 杩囨湡鏃堕棿
- */
- @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
- @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
- @ApiModelProperty(value = "杩囨湡鏃堕棿")
- private Date expireTime;
+
/**
* 浜у搧鍖匢D
*/
--
Gitblit v1.9.3