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,