From 82e0a74d2f00920e203140a49e1e1827fa6ab40b Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 15:25:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?topic=E7=9B=B8=E5=85=B3dao=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4resultMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/topic/ResiTopicCommentDao.xml      | 14 +------------
 .../resources/mapper/topic/ResiTopicDao.xml   | 20 +------------------
 .../mapper/topic/ResiTopicOperationDao.xml    | 13 +-----------
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
index 4e09e9d3d6..a760ca9e2d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
@@ -3,18 +3,6 @@
 
 <mapper namespace="com.epmet.dao.ResiTopicCommentDao">
 
-    <resultMap type="com.epmet.entity.ResiTopicCommentEntity" id="resiTopicCommentMap">
-        <result property="id" column="ID"/>
-        <result property="commentContent" column="COMMENT_CONTENT"/>
-        <result property="topicId" column="TOPIC_ID"/>
-        <result property="status" column="STATUS"/>
-        <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
+</mapper>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index cd7bb091ad..cc9cf1277b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -3,24 +3,6 @@
 
 <mapper namespace="com.epmet.dao.ResiTopicDao">
 
-    <resultMap type="com.epmet.entity.ResiTopicEntity" id="resiTopicMap">
-        <result property="id" column="ID"/>
-        <result property="groupId" column="GROUP_ID"/>
-        <result property="topicContent" column="TOPIC_CONTENT"/>
-        <result property="status" column="STATUS"/>
-        <result property="province" column="PROVINCE"/>
-        <result property="city" column="CITY"/>
-        <result property="area" column="AREA"/>
-        <result property="address" column="ADDRESS"/>
-        <result property="longitude" column="LONGITUDE"/>
-        <result property="dimension" column="DIMENSION"/>
-        <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
+</mapper>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
index 9af072ec66..6696047df3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
@@ -3,17 +3,6 @@
 
 <mapper namespace="com.epmet.dao.ResiTopicOperationDao">
 
-    <resultMap type="com.epmet.entity.ResiTopicOperationEntity" id="resiTopicOperationMap">
-        <result property="id" column="ID"/>
-        <result property="topicId" column="TOPIC_ID"/>
-        <result property="operationType" column="OPERATION_TYPE"/>
-        <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
+</mapper>

From 3296dceb6bf732c8ec06b6e5c7cd928886084d57 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 15:27:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?topic=E7=9B=B8=E5=85=B3dao=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4resultMapv2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/topic/ResiTopicCommentDao.xml     | 2 +-
 .../src/main/resources/mapper/topic/ResiTopicDao.xml            | 2 +-
 .../src/main/resources/mapper/topic/ResiTopicOperationDao.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
index a760ca9e2d..920bdef5fe 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml
@@ -1,7 +1,7 @@
 <?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.epmet.dao.ResiTopicCommentDao">
+<mapper namespace="com.epmet.modules.topic.dao.ResiTopicCommentDao">
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index cc9cf1277b..02a033f947 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -1,7 +1,7 @@
 <?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.epmet.dao.ResiTopicDao">
+<mapper namespace="com.epmet.modules.topic.dao.ResiTopicDao">
 
 
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
index 6696047df3..7262beca3a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
@@ -1,7 +1,7 @@
 <?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.epmet.dao.ResiTopicOperationDao">
+<mapper namespace="com.epmet.modules.topic.dao.ResiTopicOperationDao">