diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 1152057..3fd6bbd 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -529,7 +529,7 @@
 QSqlQuery query;
 bool isSuccess = query.exec("SELECT DISTINCT  eei.id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer ,bboi.customer_name ,sys_dept.FULL_NAME ,eei.meter_identify ,eei.check_cycle ,eei.certificate_valid   from eqpt_equipment_info eei "
                             " LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id "
-                            " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id LIMIT 100");
+                            " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id");
  if (isSuccess) {
          while (query.next()) {
              TestedDevice testedDevice;
@@ -677,15 +677,9 @@
      switch (CliTable[0].belong_standard_equipment.toInt())
      {
         case 1:
-<<<<<<< .mine         //CliTable[0].id
+     //CliTable[0].id
          //1717086652508487681
          DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList);
-=======
-         //Clable[0].item_category_idiT
-         //1717086652508487681 后面替换为 Clable[0].item_category_id
-         DataList=BaseCommonApi::getVerMultiCal("1717086652508487681",HeadList);
->>>>>>> .theirs         break;
-
      }
 
      return  DataList;

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 1152057..3fd6bbd 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -529,7 +529,7 @@
 QSqlQuery query;
 bool isSuccess = query.exec("SELECT DISTINCT  eei.id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer ,bboi.customer_name ,sys_dept.FULL_NAME ,eei.meter_identify ,eei.check_cycle ,eei.certificate_valid   from eqpt_equipment_info eei "
                             " LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id "
-                            " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id LIMIT 100");
+                            " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id");
  if (isSuccess) {
          while (query.next()) {
              TestedDevice testedDevice;
@@ -677,15 +677,9 @@
      switch (CliTable[0].belong_standard_equipment.toInt())
      {
         case 1:
-<<<<<<< .mine         //CliTable[0].id
+     //CliTable[0].id
          //1717086652508487681
          DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList);
-=======
-         //Clable[0].item_category_idiT
-         //1717086652508487681 后面替换为 Clable[0].item_category_id
-         DataList=BaseCommonApi::getVerMultiCal("1717086652508487681",HeadList);
->>>>>>> .theirs         break;
-
      }
 
      return  DataList;
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 025d895..7b60173 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -696,10 +696,10 @@
     static QString temporary_user_id;
     static QString temporary_costomer_id;
 
-<<<<<<< .mine    //判断检定装置表并查询    参数设备id
+ //判断检定装置表并查询    参数设备id
     static QList<QStringList> Search_CalibrationTable(QString DeiverId,QStringList *HeadList);
 
-=======>>>>>>> .theirs    //判断核查装置表并查询  参数设备id
+  //判断核查装置表并查询  参数设备id
     static QList<QStringList> Search_VerifyTable(QString DeiverId,QStringList *HeadList );