From ec36eca8c8e09045f4879d69926712ecd16d4bc3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 十二月 2023 17:04:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 296b795..4af9a03 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
@@ -71,8 +71,8 @@
     @ExcelColumn(name="浜嬩欢绫诲瀷")
     private String eventType;
 
-    @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
-    @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+    @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+    @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
     private Integer status;
 
     @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
@@ -87,8 +87,8 @@
     @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
     private String srcParentIndex;
 
-    @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁 ")
-    @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁 ")
+    @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
+    @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁")
     private String visitorId;
 
     @ApiModelProperty(value = "濮撳悕")

--
Gitblit v1.9.3