From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期四, 14 十二月 2023 16:17:12 +0800 Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/api/system/client/types.ts | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/api/system/client/types.ts b/src/api/system/client/types.ts index 1c505ac..d7cb926 100644 --- a/src/api/system/client/types.ts +++ b/src/api/system/client/types.ts @@ -25,9 +25,14 @@ grantTypeList: string[]; /** + * 璁惧绫诲瀷 + */ + deviceType: string; + + /** * token娲昏穬瓒呮椂鏃堕棿 */ - activityTimeout: number; + activeTimeout: number; /** * token鍥哄畾瓒呮椂 @@ -38,7 +43,6 @@ * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ status: string; - } export interface ClientForm extends BaseEntity { @@ -68,9 +72,14 @@ grantTypeList?: string[]; /** + * 璁惧绫诲瀷 + */ + deviceType?: string; + + /** * token娲昏穬瓒呮椂鏃堕棿 */ - activityTimeout?: number; + activeTimeout?: number; /** * token鍥哄畾瓒呮椂 @@ -81,7 +90,6 @@ * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ status?: string; - } export interface ClientQuery extends PageQuery { @@ -106,9 +114,14 @@ grantType?: string; /** + * 璁惧绫诲瀷 + */ + deviceType?: string; + + /** * token娲昏穬瓒呮椂鏃堕棿 */ - activityTimeout?: number; + activeTimeout?: number; /** * token鍥哄畾瓒呮椂 @@ -119,5 +132,4 @@ * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ status?: string; - } -- Gitblit v1.9.3