Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java

@@ -22,7 +22,7 @@
    private Integer eventStatus;

    @ApiModelProperty("人员标签")
    private Integer tag;
    private String tag;

    @ApiModelProperty("是否异常")
    private Integer isExp;
@@ -36,4 +36,10 @@
    private Long communityId;

    private Long userId;

    @ApiModelProperty("网格id")
    private Long gridId;

    @ApiModelProperty("正常状态（0.正常 1.异常）")
    private Integer exception;
}