fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java

@@ -19,6 +19,9 @@
   

    @ApiModelProperty(value = "身份证卡号")

   private String idCardNo;

    
    @ApiModelProperty(value = "证件类型")

    private String type;

   

    @ApiModelProperty(value = "国家")

   private String nation;