From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期二, 07 九月 2021 09:37:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 fd07593..e55fa50 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 @@ -1,11 +1,12 @@ package com.panzhihua.common.model.query.visit; +import java.io.Serializable; + import com.panzhihua.common.model.dtos.PageDTO; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import java.io.Serializable; /** * @author xyh @@ -22,7 +23,7 @@ private Integer eventStatus; @ApiModelProperty("人员标签") - private Integer tag; + private String tag; @ApiModelProperty("是否异常") private Integer isExp; @@ -36,4 +37,10 @@ private Long communityId; private Long userId; + + @ApiModelProperty("网格id") + private Long gridId; + + @ApiModelProperty("正常状态(0.正常 1.异常)") + private Integer exception; } -- Gitblit v1.7.1