From 3c917ce09089dda25db584f31e7f44527d4be455 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
index 0f7c69e..fd07593 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -11,12 +11,15 @@
  * @author xyh
  * @date 2021/6/21 15:44
  */
-@ApiModel("走访任务查询")
+@ApiModel("走访查询")
 @Data
 public class EventTasksQuery extends PageDTO implements Serializable {
 
-    @ApiModelProperty("状态:0全部,1已完成,2未完成")
+    @ApiModelProperty("走访任务状态,app:0全部,1待走访,2已完成 | 后台:0全部,1待走访 3正常,6已撤销,7异常")
     private Integer status;
+
+    @ApiModelProperty("走访记录状态,app:0全部,3正常,7异常")
+    private Integer eventStatus;
 
     @ApiModelProperty("人员标签")
     private Integer tag;
@@ -31,4 +34,6 @@
     private Long visiterId;
 
     private Long communityId;
+
+    private Long userId;
 }

--
Gitblit v1.7.1