From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 16 七月 2021 14:20:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java index 32f9a56..ee5fd62 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java @@ -10,12 +10,16 @@ @Getter public enum PopulMarriageEnum { - WH(1, "未婚"), - YH(2, "已婚"), - LY(3, "离异"), - SO(4, "丧偶"), - FJ(5, "分居"), - QT(6, "其他"); + WH(10, "未婚"), + YH(20, "已婚"), + CH(21, "初婚"), + ZH(22, "再婚"), + FH(23, "复婚"), + SO(30, "丧偶"), + LH(40, "离婚"), + + QT(60, "其他"), + WSM(90, "未说明的婚姻状况"); private final Integer code; private final String name; -- Gitblit v1.7.1