From 4c1e14db0dc29c8bd51268655d035c7d036ce95a Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 9 May 2022 02:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E7=BC=96=E5=86=99=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=E5=A4=9A=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cloud/kicc/system/api/entity/Tenant.java     | 5 ++---
 kicc-ui/src/api/platform/system/entity/tenant.ts          | 4 ++--
 kicc-ui/src/views/system/tenant/tenant.data.ts            | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
index bfa92fc5..a6d1e6e2 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Tenant.java
@@ -1,6 +1,5 @@
 package com.cloud.kicc.system.api.entity;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.CommonEntity;
@@ -43,12 +42,12 @@ public class Tenant  extends CommonEntity {
     /**
      * 租户开始时间
      */
-    private LocalDateTime startTime;
+    private LocalDateTime tenantStartTime;
 
     /**
      * 租户结束时间
      */
-    private LocalDateTime endTime;
+    private LocalDateTime tenantEndTime;
 
     /**
      * 租户状态
diff --git a/kicc-ui/src/api/platform/system/entity/tenant.ts b/kicc-ui/src/api/platform/system/entity/tenant.ts
index af608dd8..0c45ba51 100644
--- a/kicc-ui/src/api/platform/system/entity/tenant.ts
+++ b/kicc-ui/src/api/platform/system/entity/tenant.ts
@@ -16,8 +16,8 @@ export interface Tenant extends CommonEntity {
   id: string;
   name: string;
   code: string;
-  startTime: string;
-  endTime: string;
+  tenantStartTime: string;
+  tenantEndTime: string;
   status: string;
   [key: string]: any;
 }
diff --git a/kicc-ui/src/views/system/tenant/tenant.data.ts b/kicc-ui/src/views/system/tenant/tenant.data.ts
index 7c75ea72..13707782 100644
--- a/kicc-ui/src/views/system/tenant/tenant.data.ts
+++ b/kicc-ui/src/views/system/tenant/tenant.data.ts
@@ -22,12 +22,12 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '开始时间',
-    dataIndex: 'startTime',
+    dataIndex: 'tenantStartTime',
     width: 200
   },
   {
     title: '结束时间',
-    dataIndex: 'endTime',
+    dataIndex: 'tenantEndTime',
     width: 200
   },
   {
@@ -112,7 +112,7 @@ export const formSchema: FormSchema[] = [
     }
   },
   {
-    field: 'startTime',
+    field: 'tenantStartTime',
     label: '开始时间',
     component: 'DatePicker',
     required: true,
@@ -124,7 +124,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 }
   },
   {
-    field: 'endTime',
+    field: 'tenantEndTime',
     label: '结束时间',
     component: 'DatePicker',
     required: true,