diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
index ed732bf5..0c1c0e16 100644
--- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
@@ -304,15 +304,9 @@ public interface UsersMapper {
 
 	PageData getPersonByCardNo(PageData pd);
 
-<<<<<<< HEAD
-	PageData findByCardNo(PageData pd);
-
-	List<PageData> getUsersInfo(PageData pd);
-=======
 	List<PageData> getUsersInfo(PageData pd);
 
     PageData countAllByArea(PageData pd);
 
 	PageData findByCardNo(PageData pd);
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 }
diff --git a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalExplainService.java b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalExplainService.java
index 34005a1a..e5b30e7c 100644
--- a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalExplainService.java
+++ b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalExplainService.java
@@ -13,20 +13,10 @@ import java.util.List;
  */
 public interface SafetyEnvironmentalExplainService{
 
-<<<<<<< HEAD
 	/**新增
 	 * @param pd
 	 * @throws Exception
 	 */
-=======
-	/**
-     * 新增
-     *
-     * @param pd
-     * @return
-     * @throws Exception
-     */
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 	public PageData save(PageData pd)throws Exception;
 
 	/**删除
diff --git a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalInspectorService.java b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalInspectorService.java
index ab4cd115..a2d399d6 100644
--- a/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalInspectorService.java
+++ b/src/main/java/com/zcloud/service/inspection/SafetyEnvironmentalInspectorService.java
@@ -68,17 +68,9 @@ public interface SafetyEnvironmentalInspectorService{
 	List<PageData> findByIds(PageData pd)throws Exception;
 
 	/**
-<<<<<<< HEAD
 	 * 检查人核实
 	 * @param pd
 	 */
-=======
-     * 检查人核实
-     *
-     * @param pd
-     * @return
-     */
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
     PageData verify(PageData pd)throws Exception;
 
 	/**删除（根据检查ID）
diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalExplainServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalExplainServiceImpl.java
index a87776b6..9768b0c0 100644
--- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalExplainServiceImpl.java
+++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalExplainServiceImpl.java
@@ -84,10 +84,6 @@ public class SafetyEnvironmentalExplainServiceImpl implements SafetyEnvironmenta
 
 
 		safetyenvironmentalexplainMapper.save(pd);
-<<<<<<< HEAD
-		log.put("CORPINFO_ID",inspection.getString("CORPINFO_ID"));
-=======
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 		return log;
 	}
 
diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
index b4969c84..55c4bed3 100644
--- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
+++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
@@ -59,12 +59,7 @@ public class SafetyEnvironmentalInspectorServiceImpl implements SafetyEnvironmen
         log.put("CREATOR", pd.getString("ACTION_USER"));    //添加人姓名
         safetyenvironmentallogService.save(log);
         safetyenvironmentalinspectorMapper.edit(pd);
-<<<<<<< HEAD
         return log;
-=======
-        pd.put("log", JSON.toJSONString(log));
-        return pd;
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
     }
 
     /**
diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
index a1cce096..78b74678 100644
--- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
+++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
@@ -630,10 +630,6 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
 			explain.put("OPERATTIME",DateUtil.date2Str(new Date()));
 			safetyEnvironmentalExplainService.edit(explain);
 		}
-<<<<<<< HEAD
-		log.put("CORPINFO_ID",data.getString("CORPINFO_ID"));
-=======
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 		return log;
 	}
 
diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java
index 7e3d8858..f42992b1 100644
--- a/src/main/java/com/zcloud/service/system/UsersService.java
+++ b/src/main/java/com/zcloud/service/system/UsersService.java
@@ -353,12 +353,6 @@ public interface UsersService {
 
 	PageData getUserInfo(PageData pd);
 
-<<<<<<< HEAD
-    PageData getPersonByCardNo(PageData pd);
-
-	PageData findByCardNo(PageData pd);
-=======
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 
 	Object getCurrentLocation(PageData pd);
 
@@ -369,13 +363,11 @@ public interface UsersService {
 	Object getCurrentLocationCount(PageData pd);
 
 	List<PageData> getRegUserInfo(PageData pd);
-<<<<<<< HEAD
-=======
+
 
     PageData countAllByArea(PageData pd) throws Exception;
 
 	PageData getPersonByCardNo(PageData pd) throws Exception;
 
 	PageData findByCardNo(PageData pd) throws Exception;
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 }
diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
index 78bd0508..da35da08 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -484,21 +484,12 @@ public class UsersServiceImpl implements UsersService {
 		return usersMapper.getUserInfo(pd);
 	}
 
-	@Override
-<<<<<<< HEAD
-	public PageData getPersonByCardNo(PageData pd) {
-=======
-	public List<PageData> getRegUserInfo(PageData pd) {
-		return usersMapper.getUsersInfo(pd);
-	}
-
 	public PageData countAllByArea(PageData pd) throws Exception{
 		return usersMapper.countAllByArea(pd);
 	}
 
 	@Override
 	public PageData getPersonByCardNo(PageData pd) throws Exception{
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
 		return usersMapper.getPersonByCardNo(pd);
 	}
 
@@ -637,12 +628,10 @@ public class UsersServiceImpl implements UsersService {
 		return map;
 	}
 
-<<<<<<< HEAD
 
 	@Override
 	public List<PageData> getRegUserInfo(PageData pd) {
 		return usersMapper.getUsersInfo(pd);
 	}
-=======
->>>>>>> 3764db33a3956179a4ec83562e06f61feea01ce9
+
 }