From 66a5d68273d667f0d16ed18713f00be0fd6ed212 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 3 Sep 2021 09:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=BF=97=E6=84=BF=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/activity/ActInfoDTO.java  | 15 ++++-
 .../activity/result/ActInfoResultDTO.java     |  5 ++
 .../esua/epdc/volunteer/VactInfoDTO.java      | 14 ++++-
 .../esua/epdc/volunteer/VactPageInfoDTO.java  | 57 +++++++++++++++++++
 4 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactPageInfoDTO.java

diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
index c1e3b76..d5e95bf 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
@@ -17,12 +17,11 @@
 
 package com.elink.esua.epdc.activity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 活动信息表
@@ -219,4 +218,14 @@ public class ActInfoDTO implements Serializable {
      * 是否只允许志愿者参加  0否  1是
      */
     private String volunteerFlag;
+
+    /**
+     * 活动类型：0社区活动 1志愿活动
+     */
+    private String actType;
+
+    /**
+     * 志愿活动id
+     */
+    private String vactId;
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java
index 8623a50..93de3d6 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java
@@ -204,5 +204,10 @@ public class ActInfoResultDTO implements Serializable {
      */
     private String cancelReason;
 
+    /**
+     * 活动类型：0社区活动 1志愿活动
+     */
+    private String actType;
+
 
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java
index 8d18f1e..bf199ab 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java
@@ -17,9 +17,11 @@
 
 package com.elink.esua.epdc.volunteer;
 
+import lombok.Data;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -68,6 +70,16 @@ public class VactInfoDTO implements Serializable {
      */
 	private String requirement;
 
+    /**
+     * 活动位置经度
+     */
+    private BigDecimal actLongitude;
+
+    /**
+     * 活动位置纬度
+     */
+    private BigDecimal actLatitude;
+
     /**
      * 活动内容
      */
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactPageInfoDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactPageInfoDTO.java
new file mode 100644
index 0000000..f93d1bc
--- /dev/null
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactPageInfoDTO.java
@@ -0,0 +1,57 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-09-01 19:03
+ **/
+@Data
+public class VactPageInfoDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 所属组织
+     */
+    private String orgNames;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 审核状态：0-审核中，5-未通过，10-待发布，15已发布
+     */
+    private String state;
+
+    /**
+     * 审核状态
+     */
+    private String stateName;
+
+    /**
+     * 活动起止日期
+     */
+    private String startEndTime;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
+
+    /**
+     * 创建时间
+     */
+    private String createdTime;
+
+
+}
\ No newline at end of file