From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge

---
 src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java
index e69031e..60d7bb2 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java
@@ -41,5 +41,9 @@
 	@NotNull(message = "国家不能为空")
     @ApiModelProperty(value = "国家", example = "国家")
 	private String nation;
-
+	
+	@NotNull(message = "类型不能为空")
+    @ApiModelProperty(value = "类型1:身份证2:护照编号", example = "1")
+	private String type;
+	
 }

--
Gitblit v1.9.1