diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index c7df097..350db5f 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,11 +126,8 @@
     #作者
     author: wangpeng
     #待生成对象表名
-<<<<<<< HEAD
     table-name: biz_equipment_technical_target_approval,biz_equipment_attachment_approval,biz_equipment_checkpoint_approval
-=======
-    table-name: biz_business_site_executive_equipment_relation,biz_business_site_executive_info,biz_business_site_executive_info_equipment_relation,biz_business_site_executive_log,biz_business_site_executive_staff_relation
->>>>>>> a7c0b0f (分包方名录，现场测试)
+
 reminder:
   #节点--common模块config包 ReminderNodeConfig配置
   node: