From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java
index d77e68b..6f7c274 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java
@@ -33,6 +33,11 @@
private Long activityId;
/**
+ * 类型（1.党建 2.节日 3.天气预报 4.疫情 5.灾害预警 6.志愿者）
+ */
+ private Integer type;
+
+ /**
* 用户id, 和用户信息表的相关id关联
*/
private Long userId;
@@ -53,15 +58,9 @@
*/
private String pictureName;
-@Override
-public String toString() {
- return "ComActActPictureDO{" +
- "id=" + id +
- ", activityId=" + activityId +
- ", userId=" + userId +
- ", createAt=" + createAt +
- ", uploadPicture=" + uploadPicture +
- ", pictureName=" + pictureName +
- "}";
- }
+ /**
+ * 是否系统预置（1.是 0.否）
+ */
+ private Integer sysFlag;
+
}
\ No newline at end of file
--
Gitblit v1.7.1