Merge remote-tracking branch 'origin/master'

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java → epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.form;
+package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
 

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java → epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.result;
+package com.elink.esua.epdc.dto.epdc.result;
 
 import lombok.Data;
 

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java

@@ -0,0 +1,91 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-api-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-30 10:43
+ **/
+@Data
+public class AppVolunteerApplyDTO implements Serializable {
+
+    /**
+     *id
+     */
+    private String id;
+
+    /**
+     *身份证
+     */
+    private String idCard;
+
+    /**
+     *手机
+     */
+    private String mobile;
+
+    /**
+     *织织id
+     */
+    private List<Long> volunteerOrgIds;
+
+    /**
+     *自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     *姓名
+     */
+    private String realName;
+
+
+    /**
+     * 网格
+     */
+    private String deptName;
+    /**
+     * 网格ID
+     */
+    private String deptId;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户头像
+     */
+    private String faceImg;
+
+    /**
+     * 党员标识
+     */
+    private String partyFlag;
+
+
+
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java

@@ -0,0 +1,68 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-29 09:49
+ **/
+@Data
+public class AppVolunteerDetailDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     * 认证状态：0审核中 1审核通过 2审核驳回
+     */
+    private String state;
+
+    /**
+     * 状态名称
+     */
+    private String stateName;
+
+    /**
+     * 审核理由
+     */
+    private String reason;
+
+    /**
+     * 组织id
+     */
+    private List<Long> volunteerOrgIds;
+
+    /**
+     * 认组织
+     */
+    private String volunteerOrgNames;
+
+
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java

@@ -0,0 +1,62 @@
+package com.elink.esua.epdc.volunteer;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-heart-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-29 09:49
+ **/
+@Data
+public class VolunteerPageDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 自我介绍
+     */
+    private String introduceInfo;
+
+    /**
+     * 认证状态：0审核中 1审核通过 2审核驳回
+     */
+    private String state;
+
+    /**
+     * 状态名称
+     */
+    private String stateName;
+
+    /**
+     * 审核理由
+     */
+    private String reason;
+
+    /**
+     * 认组织
+     */
+    private String volunteerOrgNames;
+
+
+}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java → epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.form;
+package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
 
@@ -17,7 +17,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable {
     /**
      *用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      *头像地址

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java → epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.result;
+package com.elink.esua.epdc.dto.epdc.result;
 
 import lombok.Data;
 

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java

@@ -31,4 +31,9 @@ public class EpdcUserInfoResultDTO implements Serializable {
      */
     private Integer grade;
 
+    /**
+     * 亮身份标识：0-否，1-是
+     */
+    private String showIdentityFlag;
+
 }