From 0d9abc81a7dd9e628445472b478fa23926f71216 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 14:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 468374a..22950ef 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷")
     @ExcelColumn(name="浜嬩欢绫诲瀷")
-    private String eventType;
+    private Integer eventType;
 
     @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
     @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
@@ -77,7 +77,7 @@
 
     @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
     @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
-    private String timeout;
+    private Integer timeout;
 
     @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
     @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@@ -101,7 +101,7 @@
 
     @ApiModelProperty(value = "璇佷欢绫诲瀷 111韬唤璇�")
     @ExcelColumn(name="璇佷欢绫诲瀷 111韬唤璇�")
-    private String idType;
+    private Integer idType;
 
     @ApiModelProperty(value = "璇佷欢鍙� ")
     @ExcelColumn(name="璇佷欢鍙� ")

--
Gitblit v1.9.3