From 4d78c837e336bca9d56e9fc10b268b11b68229f8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 26 二月 2024 11:33:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
index 0f7183f..d6f9cb7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
@@ -46,7 +46,10 @@
     private String srcName;
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷")
-    private String eventType;
+    private Integer eventType;
+
+    @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+    private String eventTypeName;
 
     @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
     private Integer status;
@@ -107,10 +110,10 @@
     @ApiModelProperty(value = "璇佷欢绛惧彂鏈哄叧")
     private String signOrg;
 
-    @ApiModelProperty(value = "绂诲紑鏃堕棿")
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
     private String startTime;
 
-    @ApiModelProperty(value = "鎵嬫満鍙风爜")
+    @ApiModelProperty(value = "绂诲紑鏃堕棿")
     private String endTime;
 
     @ApiModelProperty(value = "杞︾墝鍙�")

--
Gitblit v1.9.3