From 89a874ad57ff876070bd9a032cd9113facadb758 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 15:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..c5112c6 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
@@ -67,9 +67,9 @@
@ExcelColumn(name="浜嬩欢婧愬悕绉�")
private String srcName;
- @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ @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="璇佷欢鍙� ")
@@ -131,13 +131,16 @@
@ExcelColumn(name="璇佷欢绛惧彂鏈哄叧")
private String signOrg;
- @ApiModelProperty(value = "绂诲紑鏃堕棿")
- @ExcelColumn(name="绂诲紑鏃堕棿")
+ @ApiModelProperty(value = "鏉ヨ鏃堕棿")
+ @ExcelColumn(name="鏉ヨ鏃堕棿")
private String startTime;
+ @ApiModelProperty(value = "绂诲紑鏃堕棿")
+ @ExcelColumn(name="绂诲紑鏃堕棿")
+ private String endTime;
@ApiModelProperty(value = "鎵嬫満鍙风爜")
@ExcelColumn(name="鎵嬫満鍙风爜")
- private String endTime;
+ private String phone;
@ApiModelProperty(value = "杞︾墝鍙�")
@ExcelColumn(name="杞︾墝鍙�")
--
Gitblit v1.9.3