From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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 ee5fd62..3c7bb2b 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
@@ -8,24 +8,15 @@
* @author huanghongfa
*/
@Getter
-public enum PopulMarriageEnum
-{
- WH(10, "未婚"),
- YH(20, "已婚"),
- CH(21, "初婚"),
- ZH(22, "再婚"),
- FH(23, "复婚"),
- SO(30, "丧偶"),
- LH(40, "离婚"),
+public enum PopulMarriageEnum {
+ WH(10, "未婚"), YH(20, "已婚"), CH(21, "初婚"), ZH(22, "再婚"), FH(23, "复婚"), SO(30, "丧偶"), LH(40, "离婚"),
- QT(60, "其他"),
- WSM(90, "未说明的婚姻状况");
+ QT(60, "其他"), WSM(90, "未说明的婚姻状况");
private final Integer code;
private final String name;
- PopulMarriageEnum(Integer code, String name)
- {
+ PopulMarriageEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
--
Gitblit v1.7.1