From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
index 9b694db..219a00a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -48,6 +48,7 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
@@ -77,9 +78,86 @@
/**
* 社区id
*/
- private Long community_id;
+ private Long communityId;
/**
* 是否匿名发布
*/
private Integer isHide;
+
+ /**
+ * 随手拍是否需要反馈
+ * 0 不需要 1 需要
+ */
+ private Integer isNeedFeedBack;
+ /**
+ * 反馈时间
+ */
+ private Date feedbackAt;
+ /**
+ * 拒绝原因
+ */
+ private String rejectReason;
+ /**
+ * 地址备注
+ */
+ private String addrRemark;
+
+ /**
+ * 是否删除 0 否 1 是
+ */
+ private Integer delTag;
+
+ /**
+ * 是否上报社区处理(0.否 1.是)
+ */
+ private Integer isReport;
+
+ /**
+ * 是否公示(0.否 1.是)
+ */
+ private Integer isPublicity;
+
+ /**
+ * 处理状态（1.待处理 2.已处理）
+ */
+ private Integer handleStatus;
+
+ /**
+ * 发生地址经纬度信息，逗号分割
+ */
+ private String lngLat;
+
+ /**
+ * 活动id
+ */
+ private Long activityId;
+
+ /**
+ * 参加活动标签（1.优质 2.精良 3.普通）
+ */
+ private Integer activityType;
+
+ /**
+ * 活动奖励金额
+ */
+ private BigDecimal activityAmount;
+
+ /**
+ * 参加活动标签（1.优质 2.精良 3.普通）
+ */
+ public interface activityType{
+ int yz = 1;
+ int jl = 2;
+ int pt = 3;
+ }
+
+ /**
+ * 状态 1待审核 2进行中 3已驳回 4已完成
+ */
+ public interface status{
+ int dsh = 1;
+ int dfk = 2;
+ int ybh = 3;
+ int ywc = 4;
+ }
}
--
Gitblit v1.7.1