diff --git a/src/api/system/ossConfig/types.ts b/src/api/system/ossConfig/types.ts index d227bd0..870b2ee 100644 --- a/src/api/system/ossConfig/types.ts +++ b/src/api/system/ossConfig/types.ts @@ -6,7 +6,7 @@ export interface OssConfigVO extends BaseEntity { bucketName: string; prefix: string; endpoint: string; - domain: string; + domainUrl: string; isHttps: string; region: string; status: string; @@ -29,7 +29,7 @@ export interface OssConfigForm { bucketName: string; prefix: string; endpoint: string; - domain: string; + domainUrl: string; isHttps: string; accessPolicy: string; region: string; diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index 8b6924e..d38efd7 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -16,11 +16,11 @@ export interface UserInfo { export interface UserQuery extends PageQuery { userName?: string; nickName?: string; - phonenumber?: string; + phoneNumber?: string; status?: string; deptId?: string | number; roleId?: string | number; - userIds?: string | number | (string | number)[] | undefined; + userIds?: string | number | (string | number)[] | undefined; } /** @@ -34,8 +34,8 @@ export interface UserVO extends BaseEntity { nickName: string; userType: string; email: string; - phonenumber: string; - sex: string; + phoneNumber: string; + gender: string; avatar: string; status: string; delFlag: string; @@ -60,9 +60,9 @@ export interface UserForm { userName: string; nickName?: string; password: string; - phonenumber?: string; + phoneNumber?: string; email?: string; - sex?: string; + gender?: string; status: string; remark?: string; postIds: string[]; diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue index 76fd0e4..b96faa1 100644 --- a/src/components/UserSelect/index.vue +++ b/src/components/UserSelect/index.vue @@ -3,106 +3,106 @@
- - - - - - - - - -
- -
- - - - - - - - - - 搜索 - 重置 - - + + + + + + + + + +
+ +
+ + + + + + + + + + 搜索 + 重置 + + + +
+
+ + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - -
- +
@@ -159,7 +159,7 @@ const queryParams = ref({ pageNum: 1, pageSize: 10, userName: '', - phonenumber: '', + phoneNumber: '', status: '', deptId: '', roleId: '', diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index b72dabb..a21281c 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -65,7 +65,7 @@ {{ scope.row.dictType }} - + - 缓存 - 不缓存 + 缓存 + 不缓存
@@ -345,8 +345,8 @@ const initFormData = { icon: '', menuType: MenuTypeEnum.M, orderNum: 1, - isFrame: '1', - isCache: '0', + isFrame: 'N', + isCache: 'Y', visible: '0', status: '0' }; diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue index a30717b..58740ec 100644 --- a/src/views/system/oss/config.vue +++ b/src/views/system/oss/config.vue @@ -1,35 +1,35 @@