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

xyh

2021-06-17 6fb866218f53e1cf2c8c108c5aefc2a6a9e19c80

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

@@ -70,4 +70,8 @@
     * 定位地址信息   列：position_address
     */
    private String positionAddress;
    /**
     * 发生时间     列：happen_at
     */
    private Date happenAt;
}