From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 219a00a..d6716e7 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,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-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;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -36,7 +36,7 @@
private String happenAddr;
/**
- * 状态 1待审核 2进行中 3已驳回 4已完成
+ * 状态 1待审核 2进行中 3已驳回 4已完成
*/
private Integer status;
@@ -85,8 +85,7 @@
private Integer isHide;
/**
- * 随手拍是否需要反馈
- * 0 不需要 1 需要
+ * 随手拍是否需要反馈 0 不需要 1 需要
*/
private Integer isNeedFeedBack;
/**
@@ -141,20 +140,62 @@
* 活动奖励金额
*/
private BigDecimal activityAmount;
+ /**
+ * 完成人id
+ */
+ private Long completeId;
+ /**
+ * 是否上报到城管（ 0未上报 1已上报 2已退回）
+ */
+ private Integer isReportUrban;
+ /**
+ * 城管安排状态 （0未安排 1已安排 2已处理）
+ */
+ private Integer urbanStatus;
+ /**
+ * 城管退回原因
+ */
+ private String backResult;
+ /**
+ * 移交时间
+ */
+ private Date transferTime;
+ /**
+ * 移交说明
+ */
+ private String transferReason;
+ /**
+ * 退回时间
+ */
+ private Date backTime;
+ /**
+ * 随手拍分类id
+ */
+ private Long classifyId;
+ /**
+ * 单张图片宽度
+ */
+ private BigDecimal imgWidth;
+ /**
+ * 单张图片高度
+ */
+ private BigDecimal imgHeight;
/**
- * 参加活动标签（1.优质 2.精良 3.普通）
+ * 参加活动标签（1.优质 2.精良 3.普通 4.一般）
*/
- public interface activityType{
+ public interface activityType {
int yz = 1;
int jl = 2;
int pt = 3;
+ int yb = 4;
+ int wu = 5;
}
/**
- * 状态 1待审核 2进行中 3已驳回 4已完成
+ * 状态 1待审核 2进行中 3已驳回 4已完成
*/
- public interface status{
+ public interface status {
int dsh = 1;
int dfk = 2;
int ybh = 3;
--
Gitblit v1.7.1