diff --git a/src/store/index.js b/src/store/index.js
index 8ee36a5..7c67a41 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -226,7 +226,6 @@ export default new Vuex.Store({
 
     sumPREditInit(state) {
       state.sumDoctorCheck.sumPREdit = {
-<<<<<<< HEAD
         id:'', //体检登记ID
         completeFlag:'',   //完成状态
         summaryDoctor:'', //总检医生
@@ -235,15 +234,6 @@ export default new Vuex.Store({
         auditDoctor:'', //审核医生
         auditDate:'',   //审核日期
         isLock:'',      //锁定状态
-=======
-        id: '', //体检登记ID
-        completeFlag: '',   //完成状态
-        summaryDoctor: '', //总检医生
-        summaryDate: '',   //总检日期
-        isAudit: '',       //审核状态
-        auditDoctor: '', //审核医生
-        auditDate: '',   //审核日期
->>>>>>> 8707ad6b3bfb1a5f5e84b63517a75bd718db5ab1
       }   //人员体检登记显示基本信息
     },
   },