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/PopulRelationEnum.java | 108 ++++++++++-------------------------------------------
1 files changed, 21 insertions(+), 87 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
index 162d6e6..e699c95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
@@ -8,105 +8,39 @@
* @author huanghongfa
*/
@Getter
-public enum PopulRelationEnum
-{
- relation01(1, "本人"),
- relation02(2, "户主"),
- relation10(10, "配偶"),
- relation11(11, "夫"),
- relation12(12, "妻"),
+public enum PopulRelationEnum {
+ relation01(1, "本人"), relation02(2, "户主"), relation10(10, "配偶"), relation11(11, "夫"), relation12(12, "妻"),
- relation20(20, "子"),
- relation21(21, "独生子"),
- relation22(22, "长子"),
- relation23(23, "次子"),
- relation24(24, "三子"),
- relation25(25, "四子"),
- relation26(26, "五子"),
- relation27(27, "养子或继子"),
- relation28(28, "女婿"),
- relation29(29, "其他儿子"),
+ relation20(20, "子"), relation21(21, "独生子"), relation22(22, "长子"), relation23(23, "次子"), relation24(24, "三子"),
+ relation25(25, "四子"), relation26(26, "五子"), relation27(27, "养子或继子"), relation28(28, "女婿"), relation29(29, "其他儿子"),
- relation30(30, "女"),
- relation31(31, "独生女"),
- relation32(32, "长女"),
- relation33(33, "次女"),
- relation434(34, "三女"),
- relation35(35, "四女"),
- relation36(36, "五女"),
- relation37(37, "养女或继女"),
- relation38(38, "儿媳"),
- relation39(39, "其他女儿"),
+ relation30(30, "女"), relation31(31, "独生女"), relation32(32, "长女"), relation33(33, "次女"), relation434(34, "三女"),
+ relation35(35, "四女"), relation36(36, "五女"), relation37(37, "养女或继女"), relation38(38, "儿媳"), relation39(39, "其他女儿"),
- relation40(40, "孙子、孙女或外孙子、外孙女"),
- relation41(41, "孙子"),
- relation42(42, "孙女"),
- relation43(43, "外孙子"),
- relation44(44, "外孙女"),
- relation45(45, "孙媳妇或外孙媳妇"),
- relation46(46, "孙女婿或外孙女婿"),
- relation47(47, "曾孙子或外曾孙子"),
- relation48(48, "曾孙女或外曾孙女"),
- relation49(49, "其他孙子、孙女或外孙子、外孙女"),
+ relation40(40, "孙子、孙女或外孙子、外孙女"), relation41(41, "孙子"), relation42(42, "孙女"), relation43(43, "外孙子"),
+ relation44(44, "外孙女"), relation45(45, "孙媳妇或外孙媳妇"), relation46(46, "孙女婿或外孙女婿"), relation47(47, "曾孙子或外曾孙子"),
+ relation48(48, "曾孙女或外曾孙女"), relation49(49, "其他孙子、孙女或外孙子、外孙女"),
- relation50(50, "父母"),
- relation51(51, "父亲"),
- relation52(52, "母亲"),
- relation53(53, "公公"),
- relation54(54, "婆婆"),
- relation55(55, "岳父"),
- relation56(56, "岳母"),
- relation57(57, "继父或养父"),
- relation58(58, "继母或养母"),
+ relation50(50, "父母"), relation51(51, "父亲"), relation52(52, "母亲"), relation53(53, "公公"), relation54(54, "婆婆"),
+ relation55(55, "岳父"), relation56(56, "岳母"), relation57(57, "继父或养父"), relation58(58, "继母或养母"),
relation59(59, "其他父母关系"),
- relation60(60, "祖父母或外祖父母"),
- relation61(61, "祖父"),
- relation62(62, "祖母"),
- relation63(63, "外祖父"),
- relation64(64, "外祖母"),
- relation65(65, "配偶的祖父母或外祖父母"),
- relation66(66, "曾祖父"),
- relation67(67, "曾祖母"),
- relation68(68, "配偶的曾祖父母或外曾祖父母"),
- relation69(69, "其他祖父母或外祖父母关系"),
+ relation60(60, "祖父母或外祖父母"), relation61(61, "祖父"), relation62(62, "祖母"), relation63(63, "外祖父"),
+ relation64(64, "外祖母"), relation65(65, "配偶的祖父母或外祖父母"), relation66(66, "曾祖父"), relation67(67, "曾祖母"),
+ relation68(68, "配偶的曾祖父母或外曾祖父母"), relation69(69, "其他祖父母或外祖父母关系"),
- relation70(70, "兄弟姐妹"),
- relation71(71, "兄"),
- relation72(72, "嫂"),
- relation73(73, "弟"),
- relation74(74, "弟媳"),
- relation75(75, "姐姐"),
- relation76(76, "姐夫"),
- relation77(77, "妹妹"),
- relation78(78, "妹夫"),
- relation79(79, "其他兄弟姐妹"),
- relation80(80, "其他"),
- relation81(81, "伯父"),
- relation82(82, "伯母"),
- relation83(83, "叔父"),
- relation84(84, "婶母"),
- relation85(85, "舅父"),
- relation86(86, "舅母"),
- relation87(87, "姨夫"),
- relation88(88, "姨母"),
- relation89(89, "姑母"),
+ relation70(70, "兄弟姐妹"), relation71(71, "兄"), relation72(72, "嫂"), relation73(73, "弟"), relation74(74, "弟媳"),
+ relation75(75, "姐姐"), relation76(76, "姐夫"), relation77(77, "妹妹"), relation78(78, "妹夫"), relation79(79, "其他兄弟姐妹"),
+ relation80(80, "其他"), relation81(81, "伯父"), relation82(82, "伯母"), relation83(83, "叔父"), relation84(84, "婶母"),
+ relation85(85, "舅父"), relation86(86, "舅母"), relation87(87, "姨夫"), relation88(88, "姨母"), relation89(89, "姑母"),
- relation90(90, "姑父"),
- relation91(91, "堂兄妹，堂姐妹"),
- relation92(92, "表兄妹，表姐妹"),
- relation93(93, "侄子"),
- relation94(94, "侄女"),
- relation95(95, "外甥"),
- relation96(96, "外甥女"),
- relation97(97, "其他亲属"),
- relation99(99, "非亲属");
+ relation90(90, "姑父"), relation91(91, "堂兄妹，堂姐妹"), relation92(92, "表兄妹，表姐妹"), relation93(93, "侄子"),
+ relation94(94, "侄女"), relation95(95, "外甥"), relation96(96, "外甥女"), relation97(97, "其他亲属"), relation99(99, "非亲属");
private final Integer code;
private final String name;
- PopulRelationEnum(Integer code, String name)
- {
+ PopulRelationEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
--
Gitblit v1.7.1