Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-08-19 62d2377c27bf65a048a7c104b256efcd32ad2319

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

@@ -10,15 +10,17 @@
@Getter
public enum PopulCultureLevelEnum
{
    XX(1, "小学"),
    CZ(2, "初中"),
    GZ(3, "高中"),
    ZZ(4, "中专"),
    DZ(5, "大专"),
    BK(6, "本科"),
    SS(7, "硕士"),
    BS(8, "博士"),
    QT(9, "其他");
    XX(80, "小学"),
    CZ(70, "初中"),
    GZ(61, "高中"),
    ZZ(40, "中专"),
    DZ(31, "大专"),
    BK(21, "本科"),
    SS(14, "硕士"),
    YJS(10, "研究生"),
    BS(11, "博士"),
    QT(90, "其他"),
    WM(9, "文盲");

    private final Integer code;
    private final String name;
@@ -35,7 +37,7 @@
                return item.getCode();
            }
        }
        return -1;
        return QT.getCode();
    }

    public static String getCnDescByName(Integer code) {