From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 03e3662..5fab07e 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
@@ -4,7 +4,11 @@
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -22,7 +26,7 @@
/**
* 自增id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -36,7 +40,7 @@
private String happenAddr;
/**
- * 状态 1待审核 2进行中 3已驳回 4已完成
+ * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
*/
private Integer status;
@@ -145,6 +149,10 @@
*/
private Long completeId;
/**
+ * 是否上报到人大代表（ 0未上报 1已上报）
+ */
+ private Integer isReportDpc;
+ /**
* 是否上报到城管（ 0未上报 1已上报 2已退回）
*/
private Integer isReportUrban;
@@ -172,6 +180,18 @@
* 随手拍分类id
*/
private Long classifyId;
+ /**
+ * 单张图片宽度
+ */
+ private BigDecimal imgWidth;
+ /**
+ * 单张图片高度
+ */
+ private BigDecimal imgHeight;
+ /**
+ * 评价时间
+ */
+ private Date evaluateDate;
/**
* 参加活动标签（1.优质 2.精良 3.普通 4.一般）
@@ -185,12 +205,13 @@
}
/**
- * 状态 1待审核 2进行中 3已驳回 4已完成
+ * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
*/
public interface status {
int dsh = 1;
int dfk = 2;
int ybh = 3;
- int ywc = 4;
+ int dpj = 4;
+ int ypj = 5;
}
}
--
Gitblit v1.7.1