Merge remote-tracking branch 'origin/master'

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

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.volunteer;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -41,12 +42,12 @@ public class VolunteerDTO implements Serializable {
     /**
      * 姓名
      */
-	private String name;
+    private String realName;
 
     /**
      * 身份证
      */
-	private String idcard;
+    private String idCard;
 
     /**
      * 电话

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

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.volunteer;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -36,7 +37,7 @@ public class VolunteerOrgDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private Long id;
 
     /**
      * 组织名称
@@ -74,33 +75,33 @@ public class VolunteerOrgDTO implements Serializable {
     private String address;
 
     /**
-     * 删除标识 0-否，1-是
+     * 备注
      */
-	private String delFlag;
+    private String note;
 
     /**
-     * 乐观锁
+     * 删除标识  0：未删除    1：删除
      */
-	private Integer revision;
+    private Integer delFlag;
 
     /**
-     * 创建人
+     * 创建者
      */
-	private String createdBy;
+    private Long creator;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createDate;
 
     /**
-     * 更新人
+     * 更新者
      */
-	private String updatedBy;
+    private Long updater;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updateDate;
 
 }

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java

@@ -29,4 +29,9 @@ public class EpdcContentListFormDTO implements Serializable {
      * 内容类别ID，为空时即最新资讯列表
      */
     private String typeId;
+
+    /**
+     * 部分ID
+     */
+    private Long deptId;
 }