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

manailin

2021-06-12 7a2e1fd9e34ab58caf9fa8565e94dd9fcd174a1a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java

@@ -38,7 +38,7 @@
                return item.getCode();
            }
        }
        return -1;
        return THE_MASSES.getCode();
    }

    public static String getCnDescByName(Integer code) {