diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java
new file mode 100644
index 0000000..79e1484
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.conflict;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+public class ConflictMediateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 提交人ID
+     */
+	private Long userId;
+
+    /**
+     * 矛盾纠纷类型
+     */
+	private String conflictType;
+
+    /**
+     * 行成原因
+     */
+	private String conflictReason;
+
+    /**
+     * 涉及人数
+     */
+	private Integer involvedNum;
+
+    /**
+     * 挑头骨干人员
+     */
+	private String mainstayLeader;
+
+    /**
+     * 责任单位
+     */
+	private String responsibleDept;
+
+    /**
+     * 责任人
+     */
+	private String responsiblePeople;
+
+    /**
+     * 主要采取措施
+     */
+	private String majorMeasures;
+
+    /**
+     * 目前稳控情况
+     */
+	private String currentSituation;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 提报时间
+     */
+	private Date submitTime;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java
new file mode 100644
index 0000000..d11a5d3
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.conflict.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+public class ConflictMediateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 提交人ID
+     */
+	private Long userId;
+
+    /**
+     * 矛盾纠纷类型
+     */
+    @NotBlank(message = "纠纷类型不能为空")
+	private String conflictType;
+
+    /**
+     * 行成原因
+     */
+    @NotBlank(message = "行测原因不能为空")
+	private String conflictReason;
+
+    /**
+     * 涉及人数
+     */
+    @NotBlank(message = "涉及人数不能为空")
+	private Integer involvedNum;
+
+    /**
+     * 挑头骨干人员
+     */
+    @NotBlank(message = "挑头骨干人员不能为空")
+	private String mainstayLeader;
+
+    /**
+     * 责任单位
+     */
+    @NotBlank(message = "责任部门不能为空")
+	private String responsibleDept;
+
+    /**
+     * 责任人
+     */
+    @NotBlank(message = "责任人不能为空")
+	private String responsiblePeople;
+
+    /**
+     * 主要采取措施
+     */
+    @NotBlank(message = "主要措施不能为空")
+	private String majorMeasures;
+
+    /**
+     * 目前稳控情况
+     */
+    @NotBlank(message = "当前状态不能为空")
+	private String currentSituation;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 提报时间
+     */
+    @NotBlank(message = "提报时间不能为空")
+	private Date submitTime;
+
+}
\ No newline at end of file