Merge remote-tracking branch 'origin/lingshan_master' into dev

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -106,6 +106,7 @@
         <result property="mobile" column="mobile" />
         <result property="idCard" column="id_card" />
         <result property="sourceType" column="source_type"/>
+        <result property="eventType" column="event_type"/>
         <result property="happenTime" column="happen_time"/>
         <result property="eventContent" column="event_content"/>
         <result property="latitude" column="latitude"/>
@@ -161,6 +162,7 @@
             ie.mobile,
             ie.id_card,
             ie.source_type,
+            ie.event_type,
             ie.happen_time,
             ie.event_content,
             ie.latitude,