diff --git a/public/config/config.json b/public/config/config.json
index 169f1f6..13aa1a9 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,4 @@
 {
   "title":"计量业务系统",
-<<<<<<< HEAD
-  "baseUrl": "http://111.198.10.15:21611"
-=======
   "baseUrl": "http://192.168.8.100:5909"
->>>>>>> 5e67c355ee24dc34e26bb2fdbb5214aa66e8f137
 }

diff --git a/public/config/config.json b/public/config/config.json
index 169f1f6..13aa1a9 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,4 @@
 {
   "title":"计量业务系统",
-<<<<<<< HEAD
-  "baseUrl": "http://111.198.10.15:21611"
-=======
   "baseUrl": "http://192.168.8.100:5909"
->>>>>>> 5e67c355ee24dc34e26bb2fdbb5214aa66e8f137
 }
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index e40366c..e29eb3f 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -8,28 +8,28 @@
 export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })

diff --git a/public/config/config.json b/public/config/config.json
index 169f1f6..13aa1a9 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,8 +1,4 @@
 {
   "title":"计量业务系统",
-<<<<<<< HEAD
-  "baseUrl": "http://111.198.10.15:21611"
-=======
   "baseUrl": "http://192.168.8.100:5909"
->>>>>>> 5e67c355ee24dc34e26bb2fdbb5214aa66e8f137
 }
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index e40366c..e29eb3f 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -8,28 +8,28 @@
 export function getInfoListPage(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
-      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `${prefix}/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '已审批') {
     return request({
-      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else if (statusName === '待审批') {
     return request({
-      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
   }
   else {
     return request({
-      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      url: `/equipment/approval/listPage?limit=${params.limit}&offset=${params.offset}&sort=${params.sort}&orderBy=${params.orderBy}`,
       method: 'post',
       data: params,
     })
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index a14ce57..0a832be 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -66,6 +66,7 @@
   manufacturer: '', // 生产厂家
   meterIdentify: '', // 计量标识
   model: '', // 型号规格
+  modelId: '',
   processId: '', // 流程实例id
   productCountry: '', // 生产国家
   productDate: '', // 生产日期
@@ -189,7 +190,6 @@
 // 设备相关，填充数据
 watch(() => ruleForm.value, (newVal) => {
   if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
-    console.log('自动')
     const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
     if (arr.length) {
       const data = arr[0]
@@ -197,6 +197,7 @@
       ruleForm.value.remark = data.remark
       ruleForm.value.technicalTargetList = data.technicalTargetList
       ruleForm.value.checkCycle = data.checkCycle
+      ruleForm.value.modelId = data.id
     }
   }
 }, {