Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

tangxiaobao

2021-07-14 c64da5152d32c366eecfb20b3fdc023be1d27681

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