冲突解决-glj

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java

@@ -71,4 +71,8 @@ public class CrawlInfo implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+	private String startDate;
+	private String endDate;
+
+
 }

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java

@@ -25,4 +25,6 @@ public class DataUpload extends EntityData{
 	private Long disasterId;
 
 	private String vordmId;
+	
+	private String geometry;
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml

@@ -23,7 +23,8 @@
             bdb.dict_value as disasterType,
             di.id as disasterId,
             di.disaster_time as disasterTime,
-            di.disaster_country as disasterCountry
+            di.disaster_country as disasterCountry,
+            di.geometry
         from disaster_info di
         left join blade_dict_biz bdb on di.disaster_type = dict_key
     </select>