From 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 03 九月 2021 18:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 7ab7b55..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,11 @@
package com.panzhihua.service_community.model.dos;
-import java.io.Serializable;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
-
import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -40,12 +40,13 @@
private String wishName;
/**
- * 状态 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成
+ * 状态
+ * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成
*/
private Integer status;
/**
- * 形式 1分配人员 2发起活动
+ * 形式 1分配人员 2发起活动
*/
private Integer form;
@@ -130,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