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/CarEvent.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index f229bba..8ea4fb6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -71,7 +71,7 @@
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷")
     @ExcelColumn(name="浜嬩欢绫诲瀷")
-    private String eventType;
+    private Integer eventType;
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
     @TableField(exist = false)
@@ -83,7 +83,7 @@
 
     @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
     @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
-    private String timeout;
+    private Integer timeout;
 
     @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
     @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@@ -163,7 +163,7 @@
 
     @ApiModelProperty(value = "杞︾墝棰滆壊")
     @ExcelColumn(name="杞︾墝棰滆壊")
-    private String plateColor;
+    private Integer plateColor;
 
     @ApiModelProperty(value = "杞︾墝缃俊搴�", example = "1")
     @ExcelColumn(name="杞︾墝缃俊搴�")

--
Gitblit v1.9.3