Merge branch 'test' into 'test_bak'

罗元桥

2021-09-26 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationPensionExcelListen.java

@@ -95,7 +95,7 @@
            throw new ServiceException("100", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.PENSION_POPULATION_ERROR_LIST;
        String key = Constants.PENSION_POPULATION_ERROR_LIST +  + communityId;

        Map<String, String> dictMap = dictionaryR.getData().stream()
            .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));