From 321ebdf330ad299e87132cc51a6c3affe3f51e4d Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 10 九月 2021 11:24:16 +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/ComActMicroWishDO.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
index 651c1d1..5f2b01b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
@@ -1,11 +1,10 @@
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 lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -59,6 +58,7 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
@@ -114,6 +114,10 @@
*/
private String finish;
/**
+ * 完成时间=反馈时间
+ */
+ private Date finishAt;
+ /**
* 驳回理由
*/
private String rejectReason;
@@ -127,5 +131,32 @@
* 反馈图片集合，逗号分隔
*/
private String feedbackPhotoPathList;
+ /**
+ * 目标集心数
+ */
+ private Integer aimNum;
+
+ /**
+ * 单张图片宽度
+ */
+ private BigDecimal imgWidth;
+
+ /**
+ * 单张图片高度
+ */
+ private BigDecimal imgHeight;
+
+ /**
+ * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中
+ */
+ public interface status{
+ int dsh=1;
+ int dfp=2;
+ int jxz=3;
+ int ybh=4;
+ int dqr=5;
+ int ywc=6;
+ int jx=7;
+ }
}
--
Gitblit v1.7.1