Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireResourceSupervisionMapper.xml

@@ -67,7 +67,7 @@
           AND cs.biz_org_code like concat(#{bizOrgCode}, '%')
     </select>
 
-    <select id="getZzPersonNum" resultType="Map">
+    <select id="getZzPersonNum" resultType="java.lang.String">
         SELECT
                 u.amos_org_id AS zzFireNum
             FROM
@@ -80,7 +80,7 @@
               AND dfi.field_code = 'peopleType'
     </select>
 
-    <select id="getYwPersonNum" resultType="Map">
+    <select id="getYwPersonNum" resultType="java.lang.String">
         SELECT
             u.amos_org_id AS ywNum
         FROM