From 9570ef1595c699fd2f8b413bc15c843d61696ba4 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 28 Sep 2021 13:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/volunteer/AppVolunteerApplyDTO.java  |  5 ++--
 .../epdc/volunteer/AppVolunteerDetailDTO.java |  5 ++--
 .../volunteer/OrgDetailListResultDTO.java     | 23 +++++++++++++++++++
 .../epdc/volunteer/OrgDetailResultDTO.java    |  6 +++--
 .../volunteer/VolunteerListResultDTO.java     | 23 +++++++++++++++++++
 5 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailListResultDTO.java
 create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerListResultDTO.java

diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java
index 02887c2..55ec87a 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java
@@ -3,7 +3,6 @@ package com.elink.esua.epdc.volunteer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @program: epdc-cloud-api-yushan
@@ -30,9 +29,9 @@ public class AppVolunteerApplyDTO implements Serializable {
     private String mobile;
 
     /**
-     *织织id
+     *组织id
      */
-    private List<Long> volunteerOrgIds;
+    private Long volunteerOrgId;
 
     /**
      *自我介绍
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java
index 07a0273..9f458c4 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java
@@ -3,7 +3,6 @@ package com.elink.esua.epdc.volunteer;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @program: epdc-cloud-heart-yushan
@@ -57,12 +56,12 @@ public class AppVolunteerDetailDTO implements Serializable {
     /**
      * 组织id
      */
-    private List<Long> volunteerOrgIds;
+    private Long volunteerOrgId;
 
     /**
      * 认组织
      */
-    private String volunteerOrgNames;
+    private String volunteerOrgName;
 
 
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailListResultDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailListResultDTO.java
new file mode 100644
index 0000000..7e5646b
--- /dev/null
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailListResultDTO.java
@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-09-28 10:43
+ **/
+@Data
+public class OrgDetailListResultDTO implements Serializable {
+
+    private String id;
+
+    private String headPic;
+
+    private String title;
+
+    private String actTime;
+}
\ No newline at end of file
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailResultDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailResultDTO.java
index 7d2f21e..c3b1dd1 100644
--- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailResultDTO.java
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/OrgDetailResultDTO.java
@@ -25,8 +25,10 @@ public class OrgDetailResultDTO implements Serializable {
 
     private String note;
 
-    private String applyFlag;
+    private Boolean applyFlag;
 
-    private String adminFlag;
+    private Boolean adminFlag;
+
+    private Boolean publishFlag;
 
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerListResultDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerListResultDTO.java
new file mode 100644
index 0000000..74269b0
--- /dev/null
+++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerListResultDTO.java
@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-09-28 10:55
+ **/
+@Data
+public class VolunteerListResultDTO implements Serializable {
+
+    private String id;
+
+    private String faceImg;
+
+    private String realName;
+
+    private String deptName;
+}
\ No newline at end of file