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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -18,8 +18,7 @@
    SO(30, "丧偶"),
    LH(40, "离婚"),

    FJ(50, "分居"),
    QT(90, "其他"),
    QT(60, "其他"),
    WSM(90, "未说明的婚姻状况");

    private final Integer code;