diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
index 73a1cf8..856b75b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
@@ -4,16 +4,11 @@ package com.kening.vordm.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kening.vordm.entity.DisasterInfo;
-<<<<<<< HEAD
-import com.kening.vordm.entity.News;
-=======
 import com.kening.vordm.vo.DisasterMangerInfo;
 import com.kening.vordm.vo.GroupByUse;
->>>>>>> c534592f957fb2b2a48a9a9f05724ec5d97cc72e
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Queue;
 
 /**
 * @author G1393
@@ -28,8 +23,6 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 										  @Param("disaster_time") String disaster_time,
 										  @Param("name") String name);
 
-	List<DisasterInfo>  getHomeDisasterInfo();
-
 	/**
 	 * 获取债害详情信息
 	 * @param id
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 47b066f..0e6b658 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -36,11 +36,6 @@
         m.organization
     </sql>
 
-    <select id="getHomeDisasterInfo" parameterType="com.kening.vordm.entity.DisasterInfo">
-        select *
-        from new_vordm.disaster_info
-    </select>
-
     <select id="getDisasterInfoDetail" resultType="com.kening.vordm.entity.DisasterInfo">
         select
         <include refid="Base_Column_List"/>