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

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/mybatis/ArrayTypeHandler.java

@@ -62,4 +62,6 @@ public class ArrayTypeHandler extends BaseTypeHandler<Object[]> {
         }
         return null;
     }
+
+
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpImageDataTotalMapper.xml

@@ -89,7 +89,7 @@
     </sql>
     <!-- This code was generated by TableGo tools, mark 2 end. -->
 
-    <select id="queryDataList" resultType="com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal">
+    <select id="queryDataList" resultMap="BaseResultMap">
             select st_asgeojson(range,16,0) as range, *
                 <include refid="geomSelectSql" />
             limit 5000