diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index e39ad0445..7762c0420 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -176,3 +177,5 @@ declare module '@vue/runtime-core' {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
   }
 }
+=======
+>>>>>>> v7_master
diff --git a/src/views/date/assets.vue b/src/views/date/assets.vue
index 0156f30c9..db716cc3a 100644
--- a/src/views/date/assets.vue
+++ b/src/views/date/assets.vue
@@ -153,7 +153,7 @@ onMounted(()=>{
 				<el-table-column prop="databaseName" label="数据库名称"   width="160" />
 				<el-table-column prop="interfaceTypeName" label="接口方式"   width="100" />
 				<el-table-column prop="ipAddress" label="IP地址"   width="160" />
-				<el-table-column prop="port" label="端口"   width="100" align="center" />
+				<el-table-column prop="port" label="端口"   align="center" />
 				<el-table-column prop="account" label="帐号"  width="160" />
 				<el-table-column prop="author" label="帐号权限" width="100"  align="center" />
 				<el-table-column prop="status" label="状态"  width="100" align="center">