Merge branch 'txb'

tangxiaobao

2021-08-16 4416c6c2b86c3c20e994331e7377c6df3507aaaa

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

@@ -110,7 +110,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String Veterans = Constants.VETERANS_POPULATION_ERROR_LIST + communityId;
            String Veterans = Constants.VETERANS_POPULATION_ERROR_LIST;

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