Merge branch 'test' into 'test_esay_photo'

罗元桥

2021-06-24 11b327fa3151205a340d9a4337afb096b776594a

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