From e2b0e215d7f208a8f40aadb5ff05cd0f3088f0d9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 09:09:35 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index acb77ee..de1a53f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -60,7 +61,7 @@
     private String faceImg;
     @ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
     @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
-    private String faceServeIndexCode;
+    private String faceServerIndexCode;
     @ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
     @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
     private String faceId;
@@ -98,7 +99,9 @@
     @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
     @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
     private String idcardDecode;
-
+    @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
+    @ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
+    private Integer idcardType;
     @ApiModelProperty(value = "宸ュ彿")
     @ExcelColumn(name="宸ュ彿")
     private String code;
@@ -110,7 +113,9 @@
     @ApiModelProperty(value = "鐘舵�� 0姝e父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
     @ExcelColumn(name="鐘舵�� 0姝e父 1绂佺敤 2鎷夐粦/鍐荤粨")
     private Integer status;
-
+    @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
+    @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
+    private Integer sex;
     @ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
     @ExcelColumn(name="娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
     private Integer parentId;
@@ -134,7 +139,7 @@
 
     @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
     @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private Integer hkId;
+    private String hkId;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
@@ -147,7 +152,7 @@
 
     @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
     @ExcelColumn(name="ERP鏍囪瘑")
-    private Integer erpId;
+    private String erpId;
 
     @ApiModelProperty(value = "ERP鍚屾鏃堕棿")
     @ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -195,5 +200,8 @@
     @ApiModelProperty(value = "ERP缁勭粐缂栫爜")
     @ExcelColumn(name="ERP缁勭粐缂栫爜")
     private String erpOrgId;
+    @ApiModelProperty(value = "缁勭粐鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
 
 }

--
Gitblit v1.9.3