diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateDetailFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateDetailFormDTO.java
new file mode 100644
index 0000000..90ecbb3
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateDetailFormDTO.java
@@ -0,0 +1,51 @@
+/**
+ * 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 java.io.Serializable;
+
+
+/**
+ * 工作端--矛盾调解 详情
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-08
+ */
+@Data
+public class ConflictMediateDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 纠纷id
+     */
+    private String conflictId;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateHistoryFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateHistoryFormDTO.java
new file mode 100644
index 0000000..0bb55ab
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateHistoryFormDTO.java
@@ -0,0 +1,64 @@
+/**
+ * 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;
+
+
+/**
+ * 工作端--矛盾纠纷历史上报列表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-08
+ */
+@Data
+public class ConflictMediateHistoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 页码
+     */
+    @NotBlank(message = "页码不能为空")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @NotBlank(message = "页容量不能为空")
+    private Integer pageSize;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    private String timestamp;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateDetailResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateDetailResultDTO.java
new file mode 100644
index 0000000..ebb8900
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateDetailResultDTO.java
@@ -0,0 +1,92 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+public class ConflictMediateDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 矛盾纠纷类型
+     */
+	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;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateHistoryResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateHistoryResultDTO.java
new file mode 100644
index 0000000..304932d
--- /dev/null
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateHistoryResultDTO.java
@@ -0,0 +1,47 @@
+/**
+ * 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.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+public class ConflictMediateHistoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 提报时间
+     */
+	private Date submitTime;
+
+}
\ No newline at end of file