Merge branch 'test_screen' into 'test'

罗元桥

2021-06-22 7df36d4bf09248b6d4f82ef52b5cb2d197619bed

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

@@ -64,4 +64,5 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    private Boolean upload;
}