Merge remote-tracking branch 'origin/test_screen' into test_screen

xyh

2021-06-18 aa9d5899deda2c9a9c4da111e89509136f1c4ec2

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java

@@ -95,4 +95,13 @@
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 类型，1、区县网格2街道网格3社区网格
     */
    public interface type{
        Long qx = 1L;
        Long jd = 2L;
        Long sq = 3L;
    }
}