From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期二, 22 六月 2021 16:07:50 +0800 Subject: [PATCH] Merge branch 'test' into 'test_screen' --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java index a39854b..c2e81bf 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java @@ -1,11 +1,9 @@ package com.panzhihua.service_grid.model.dos; -import java.util.*; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; @@ -25,7 +23,7 @@ private static final long serialVersionUID = 1L; /** - * 分类(1、事件 2、走访) 列: classification + * 分类(1、事件 2、走访 3、事件流转) 列: classification */ private Integer classification; /** @@ -50,6 +48,10 @@ */ private String resourceSize; /** + * 视频或音频时长 列: resource_time + */ + private Integer resourceTime; + /** * 事件上传的资源URL地址 列: url */ private String url; @@ -62,4 +64,5 @@ */ @TableField(fill = FieldFill.INSERT) private Date createAt; + private Boolean upload; } \ No newline at end of file -- Gitblit v1.7.1