Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/MultipleMapper.xml

@@ -16,7 +16,7 @@
     </update>
 
     <select id="getBlockMergeResult" resultType="Map">
-        select idarray, area / 0.0015 as area, public.st_asewkt(geom) as geom
+        select idarray, area / 0.0015 as area, public.st_asewkt(public.st_collectionextract(geom)) as geom
         from ${tableName}
     </select>
 </mapper>