diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java
new file mode 100644
index 0000000..4488fa6
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java
@@ -0,0 +1,69 @@
+/**
+ * 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.modules.conflict.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.*;
+import com.elink.esua.epdc.dto.psychology.result.*;
+import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService;
+import com.elink.esua.epdc.modules.psychology.service.PsychologistService;
+import com.elink.esua.epdc.modules.psychology.service.PsychologyAnswerService;
+import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 心理咨询师表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-04
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "conflict")
+public class AppConflictController {
+
+    @Autowired
+    private ConflictMediateService conflictMediateService;
+
+//    @GetMapping("listPsychiatrist")
+//    public Result<List<PsychologistResultDTO>> listPsychiatrist(@RequestBody PsychologistFormDTO formDto) throws Exception {
+//        //效验数据
+//        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+//        List<PsychologistResultDTO> list = psychologistService.listPsychiatrist(formDto);
+//        return new Result<List<PsychologistResultDTO>>().ok(list);
+//    }
+
+    @PostMapping("submit")
+    public Result submit(@RequestBody ConflictMediateFormDTO formDto) throws Exception {
+        UserDetail user = SecurityUser.getUser();
+        formDto.setUserId(user.getId());
+        conflictMediateService.submit(formDto);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java
new file mode 100644
index 0000000..3915c82
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.modules.conflict.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO;
+import com.elink.esua.epdc.modules.conflict.excel.ConflictMediateExcel;
+import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@RestController
+@RequestMapping("conflictmediate")
+public class ConflictMediateController {
+    
+    @Autowired
+    private ConflictMediateService conflictMediateService;
+
+    @GetMapping("page")
+    public Result<PageData<ConflictMediateDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ConflictMediateDTO> page = conflictMediateService.page(params);
+        return new Result<PageData<ConflictMediateDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ConflictMediateDTO> get(@PathVariable("id") String id){
+        ConflictMediateDTO data = conflictMediateService.get(id);
+        return new Result<ConflictMediateDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ConflictMediateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        conflictMediateService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ConflictMediateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        conflictMediateService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        conflictMediateService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ConflictMediateDTO> list = conflictMediateService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ConflictMediateExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java
new file mode 100644
index 0000000..df0ae71
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.modules.conflict.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Mapper
+public interface ConflictMediateDao extends BaseDao<ConflictMediateEntity> {
+	
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
new file mode 100644
index 0000000..6bcd4a9
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
@@ -0,0 +1,96 @@
+/**
+ * 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.modules.conflict.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_conflict_mediate")
+public class ConflictMediateEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 提交人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;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java
new file mode 100644
index 0000000..0fb0e7e
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java
@@ -0,0 +1,89 @@
+/**
+ * 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.modules.conflict.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Data
+public class ConflictMediateExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "提交人ID")
+    private Long userId;
+
+    @Excel(name = "矛盾纠纷类型")
+    private String conflictType;
+
+    @Excel(name = "行成原因")
+    private String conflictReason;
+
+    @Excel(name = "涉及人数")
+    private Integer involvedNum;
+
+    @Excel(name = "挑头骨干人员")
+    private String mainstayLeader;
+
+    @Excel(name = "责任单位")
+    private String responsibleDept;
+
+    @Excel(name = "责任人")
+    private String responsiblePeople;
+
+    @Excel(name = "主要采取措施")
+    private String majorMeasures;
+
+    @Excel(name = "目前稳控情况")
+    private String currentSituation;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "提报时间")
+    private Date submitTime;
+
+    @Excel(name = "删除标记 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.java
new file mode 100644
index 0000000..5b9b9e6
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/redis/ConflictMediateRedis.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.modules.conflict.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Component
+public class ConflictMediateRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java
new file mode 100644
index 0000000..cf54c82
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java
@@ -0,0 +1,107 @@
+/**
+ * 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.modules.conflict.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO;
+import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+public interface ConflictMediateService extends BaseService<ConflictMediateEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ConflictMediateDTO>
+     * @author generator
+     * @date 2020-06-10
+     */
+    PageData<ConflictMediateDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ConflictMediateDTO>
+     * @author generator
+     * @date 2020-06-10
+     */
+    List<ConflictMediateDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ConflictMediateDTO
+     * @author generator
+     * @date 2020-06-10
+     */
+    ConflictMediateDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-10
+     */
+    void save(ConflictMediateDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-10
+     */
+    void update(ConflictMediateDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-06-10
+     */
+    void delete(String[] ids);
+
+    /**
+     * 工作端--矛盾纠纷提交
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-10
+     */
+    void submit(ConflictMediateFormDTO dto);
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
new file mode 100644
index 0000000..a4acd82
--- /dev/null
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
@@ -0,0 +1,111 @@
+/**
+ * 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.modules.conflict.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
+import com.elink.esua.epdc.modules.conflict.dao.ConflictMediateDao;
+import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO;
+import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
+import com.elink.esua.epdc.modules.conflict.redis.ConflictMediateRedis;
+import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 矛盾纠纷调解情况
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-06-10
+ */
+@Service
+public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateDao, ConflictMediateEntity> implements ConflictMediateService {
+
+    @Autowired
+    private ConflictMediateRedis conflictMediateRedis;
+
+    @Override
+    public PageData<ConflictMediateDTO> page(Map<String, Object> params) {
+        IPage<ConflictMediateEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ConflictMediateDTO.class);
+    }
+
+    @Override
+    public List<ConflictMediateDTO> list(Map<String, Object> params) {
+        List<ConflictMediateEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class);
+    }
+
+    private QueryWrapper<ConflictMediateEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ConflictMediateEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ConflictMediateDTO get(String id) {
+        ConflictMediateEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ConflictMediateDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ConflictMediateDTO dto) {
+        ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ConflictMediateDTO dto) {
+        ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submit(ConflictMediateFormDTO dto) {
+        ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
+        insert(entity);
+    }
+}
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java
index e03fead..09f227b 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java
@@ -72,8 +72,6 @@ public class AppPsychologistController {
 
     @PostMapping("submitQuestion")
     public Result submitQuestion(@RequestBody PsychologyQuestionFormDTO formDto) throws Exception {
-        //效验数据
-        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
         psychologyQuestionService.saveQuestion(formDto);
         return new Result();
     }
@@ -116,8 +114,6 @@ public class AppPsychologistController {
     public Result submitAnswer(@RequestBody PsychologySubmitAnswerFormDTO formDto) throws Exception {
         UserDetail user = SecurityUser.getUser();
         formDto.setUserId(user.getId().toString());
-        //效验数据
-        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
         psychologyAnswerService.saveAnswer(formDto);
         return new Result();
     }
diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
new file mode 100644
index 0000000..51d279b
--- /dev/null
+++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.conflict.dao.ConflictMediateDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity" id="conflictMediateMap">
+        <result property="id" column="ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="conflictType" column="CONFLICT_TYPE"/>
+        <result property="conflictReason" column="CONFLICT_REASON"/>
+        <result property="involvedNum" column="INVOLVED_NUM"/>
+        <result property="mainstayLeader" column="MAINSTAY_LEADER"/>
+        <result property="responsibleDept" column="RESPONSIBLE_DEPT"/>
+        <result property="responsiblePeople" column="RESPONSIBLE_PEOPLE"/>
+        <result property="majorMeasures" column="MAJOR_MEASURES"/>
+        <result property="currentSituation" column="CURRENT_SITUATION"/>
+        <result property="remark" column="REMARK"/>
+        <result property="submitTime" column="SUBMIT_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file