Merge branches 'dev_5big_coverage', 'master' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -76,6 +76,8 @@ public class IcResiServiceImpl implements IcResiService {
             query.eq(IcResiUserEntity::getIsXfry, true);
         } else if ("resi_snry".equals(categoryKey)) {
             query.eq(IcResiUserEntity::getIsSn, true);
+        } else if ("resi_szry".equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSz, true);
         }
 
         if (StringUtils.isNotBlank(search)) {