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

huanghongfa

2021-06-24 eb0e0847f4030ec96d18ab0e632aa1668ff6126d

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