Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

 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;
}