Browse Source

添加国籍

suntianwu 3 năm trước cách đây
mục cha
commit
134138e3ce

+ 5 - 1
src/main/java/com/iden/common/entity/IdenPerson.java

@@ -62,7 +62,11 @@ public class IdenPerson implements Serializable {
     private String gender;
 
 
-    @ApiModelProperty("证件类型:1:身份证 2:护照  3 军官证")
+    @ApiModelProperty("国籍")
+    @TableField("NATIONALITY")
+    private String nationality;
+
+    @ApiModelProperty("证件类型:1:身份证 2:护照")
     @TableField("CREDENTIALS_TYPE")
     private String credentialsType;
 

+ 1 - 6
src/main/java/com/iden/common/enums/CredentialsTypeEnum.java

@@ -12,8 +12,7 @@ public enum CredentialsTypeEnum {
      * 证件类型类型
      */
     IDCARD("1","身份证"),
-    PASSPORT("2","护照"),
-     OL("3","军官证");
+    PASSPORT("2","护照");
     private String value;
     private String name;
     CredentialsTypeEnum(String value, String name) {
@@ -35,8 +34,6 @@ public enum CredentialsTypeEnum {
             return  IDCARD.name;
         } else if (PASSPORT.getValue().equals(value)) {
             return PASSPORT.name;
-        } else if (OL.getValue().equals(value)) {
-            return OL.name;
         }
         return null;
     }
@@ -48,8 +45,6 @@ public enum CredentialsTypeEnum {
             return  IDCARD.value;
         } else if (PASSPORT.getName().equals(name)) {
             return PASSPORT.value;
-        }  else if (OL.getName().equals(name)) {
-            return OL.value;
         }
         return null;
     }

+ 4 - 1
src/main/java/com/iden/common/vo/PersonVO.java

@@ -49,9 +49,12 @@ public class PersonVO implements Serializable {
     @ApiModelProperty("性别")
     private String genderName;
 
-    @ApiModelProperty("证件类型:1:身份证 2:护照  3 军官证")
+    @ApiModelProperty("证件类型:1:身份证 2:护照")
     private String credentialsType;
 
+    @ApiModelProperty("国籍")
+    private String nationality;
+
     @ApiModelProperty("证件类型")
     private String credentialsTypeName;