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

huanghongfa

2021-08-15 4ca86cb13b25ece24a323300294b0507926b37a2

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

@@ -125,7 +125,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();