diff --git a/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
index 3703c2b..7d99e9a 100644
--- a/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
+++ b/src/views/military/modules/equipment/device/info/DtDeviceInfo.data.ts
@@ -9,6 +9,7 @@ export const columns: BasicColumn[] = [
     title: '所属站点',
     align: "center",
     dataIndex: 'deviceOwnerId_dictText'
+    
   },
   {
     title: '类型',
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
index 74324b6..9daec69 100644
--- a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
@@ -173,6 +173,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'isAudit_dictText',
     width: 120,
   },
+  {
+    title: '服务器类型',
+    align: 'center',
+    dataIndex: 'serverType_dictText',
+    // width: 120,
+  },
   {
     title: '用户名',
     align: 'center',
@@ -296,7 +302,7 @@ export const searchFormSchema: FormSchema[] = [
   // },
   {
     label: '数据协议',
-    field: 'protocol',
+    field: 'dataProtocol',
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'dt_device_data_protocol,protocol_name,protocol_type',
@@ -305,7 +311,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     label: '网络协议',
-    field: 'protocol',
+    field: 'netProtocol',
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'dt_device_net_protocol,protocol_name,protocol_type',
@@ -482,6 +488,18 @@ export const formSchema: FormSchema[] = [
       return [{ required: true, message: '入网许可证不能为空!' }];
     },
   },
+  {
+    label: '服务器类型',
+    field: 'serverType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'device_server_type',
+      stringToNumber: true,
+    },
+    // dynamicRules: ({ model, schema }) => {
+    //   return [{ required: true, message: '入网许可证不能为空!' }];
+    // },
+  },
   {
     label: '用户名',
     field: 'username',