Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-10 5513e69c82a82eb6be786d5cb8e23b81bffc8636

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

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

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