Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-04 c62d25bf9cf51d7421035abd6489945e77db1f04

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java

@@ -14,7 +14,7 @@
    @ApiModelProperty("事件id")
    private Long id;

    @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.宣传教育 8.走访任务)")
    @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.走访任务)")
    private String type;

    @ApiModelProperty("事件标题")