From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期一, 21 六月 2021 13:55:11 +0800 Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java index 1c418d4..d98dca1 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java @@ -217,6 +217,8 @@ @TableField(fill = FieldFill.UPDATE) private Date updateAt; + private Boolean upload; + /** * 撤销人/社区ID 列: revoke_id */ -- Gitblit v1.7.1