From 657d75ff683ef35003bedd64a0fa420e7d294f85 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 16:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index b42bf94..0a97010 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -218,6 +218,10 @@
     @ExcelColumn(name="韬唤璇乮d")
     private String idNum;
 
+    @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+    @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+    private String idcardDecode;
+
     @ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
     @ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
     private String issuingAuthority;

--
Gitblit v1.9.3