Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java

@@ -66,7 +66,7 @@
    @Override
    public List<EmergencySuppliesInfo> listCountByIds(List<Long> ids) {
        if(null == ids || ids.size() == 0){
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PRAM_NULL);
            throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
        }
        return baseMapper.listCountByIds(ids, (byte) 0,EmergencySuppliesStatusEnum.STATUS_ONE.getCode());
    }