Merge branch 'dev_bugfix_ljj'

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -948,6 +948,7 @@
             ic_resi_user
         WHERE
             del_flag = '0'
+        AND sub_status not in('11','21')<!-- 排除迁出和死亡人员数据 -->
         <choose>
             <when test='orgType == "agency"'>
                 AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%'))