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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 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) {