From 49bcc80718cef5045348937caef5d5073466ef6f Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 16:47:37 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysUserPostMapper.xml       | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 21c40981b..c13b06f81 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -1,34 +1,34 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
-		<result property="userId"     column="user_id"      />
-		<result property="postId"     column="post_id"      />
-	</resultMap>
+    <resultMap type="SysUserPost" id="SysUserPostResult">
+        <result property="userId"     column="user_id"      />
+        <result property="postId"     column="post_id"      />
+    </resultMap>
+
+    <delete id="deleteUserPostByUserId" parameterType="Long">
+        delete from sys_user_post where user_id=#{userId}
+    </delete>
+
+    <select id="countUserPostById" resultType="Integer">
+        select count(1) from sys_user_post where post_id=#{postId}
+    </select>
+
+    <delete id="deleteUserPost" parameterType="Long">
+        delete from sys_user_post where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <insert id="batchUserPost">
+        insert into sys_user_post(user_id, post_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.postId})
+        </foreach>
+    </insert>
 
-	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
-	</select>
-	
-	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.postId})
-		</foreach>
-	</insert>
-	
 </mapper> 
\ No newline at end of file

From 1c6e6f41889f8d401ea9b946b78ca10ac20f7d6f Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 16:47:55 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/test

diff --git a/doc/test b/doc/test
new file mode 100644
index 000000000..1792b7dc2
--- /dev/null
+++ b/doc/test
@@ -0,0 +1 @@
+ceshiwenj
\ No newline at end of file

From 99460c49582f77e924085685a42a73df5c229ab9 Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 16:34:47 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysUserRoleMapper.xml       | 85 ++++++++++---------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index b091ba757..1b0f1276d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -1,48 +1,49 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
-		<result property="userId"     column="user_id"      />
-		<result property="roleId"     column="role_id"      />
-	</resultMap>
-	
-	<select id="selectUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
-		select user_id, role_id from sys_user_role where user_id = #{userId}
-	</select>
 
-	<delete id="deleteUserRoleByUserId" parameterType="Long">
-		delete from sys_user_role where user_id = #{userId}
-	</delete>
-	
-	<select id="countUserRoleByRoleId" resultType="Integer">
-	    select count(1) from sys_user_role where role_id = #{roleId}  
-	</select>
-	
-	<delete id="deleteUserRole" parameterType="Long">
- 		delete from sys_user_role where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserRole">
-		insert into sys_user_role(user_id, role_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.roleId})
-		</foreach>
-	</insert>
-	
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
-	</delete>
-	
-	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- 	        #{userId}
-            </foreach> 
-	</delete>
+    <resultMap type="SysUserRole" id="SysUserRoleResult">
+        <result property="userId"     column="user_id"      />
+        <result property="roleId"     column="role_id"      />
+    </resultMap>
+
+    <select id="selectUserRoleByUserId" parameterType="Long" resultMap="SysUserRoleResult">
+        select user_id, role_id from sys_user_role where user_id = #{userId}
+    </select>
+
+    <delete id="deleteUserRoleByUserId" parameterType="Long">
+        delete from sys_user_role where user_id = #{userId}
+    </delete>
+
+    <select id="countUserRoleByRoleId" resultType="Integer">
+        select count(1) from sys_user_role where role_id = #{roleId}
+    </select>
+
+    <delete id="deleteUserRole" parameterType="Long">
+        delete from sys_user_role where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <insert id="batchUserRole">
+        insert into sys_user_role(user_id, role_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.roleId})
+        </foreach>
+    </insert>
+
+    <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+        delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+    </delete>
+
+    <delete id="deleteUserRoleInfos">
+        delete from sys_user_role where role_id=#{roleId} and user_id in
+        <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
 </mapper> 
\ No newline at end of file

From ea024039f2705e988c37bf13b82275492d116405 Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 19:16:24 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test                                                        | 2 +-
 .../src/main/resources/mapper/system/SysUserRoleMapper.xml      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/test b/doc/test
index 1792b7dc2..2d1c29677 100644
--- a/doc/test
+++ b/doc/test
@@ -1 +1 @@
-ceshiwenj
\ No newline at end of file
+ceshiwenjhhhe
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 1b0f1276d..8a28854f1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -4,7 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-
     <resultMap type="SysUserRole" id="SysUserRoleResult">
         <result property="userId"     column="user_id"      />
         <result property="roleId"     column="role_id"      />

From f254db763d1f2201214687a76fa28c331acb0f81 Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 19:24:55 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test b/doc/test
index 2d1c29677..78c75670c 100644
--- a/doc/test
+++ b/doc/test
@@ -1 +1 @@
-ceshiwenjhhhe
\ No newline at end of file
+ceshiwenjhhhe 基础版本
\ No newline at end of file

From 74f66885917c00178c9e3b3d411cfbd46614b65c Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:33:07 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=96=B0=E5=BB=BAtest1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test1 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/test1

diff --git a/doc/test1 b/doc/test1
new file mode 100644
index 000000000..f079749c4
--- /dev/null
+++ b/doc/test1
@@ -0,0 +1 @@
+test1
\ No newline at end of file

From 17b292ac6dd3c8ed2b057cac287f6fe4f52ed31e Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:49:30 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test b/doc/test
index 78c75670c..c2d74f151 100644
--- a/doc/test
+++ b/doc/test
@@ -1 +1 @@
-ceshiwenjhhhe 基础版本
\ No newline at end of file
+ceshiwenjhhhe 基础版本 测试
\ No newline at end of file

From a2da53ae1a75a628ecbcc90c72b918f7625c932d Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:49:43 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test1 b/doc/test1
index f079749c4..9796d4871 100644
--- a/doc/test1
+++ b/doc/test1
@@ -1 +1 @@
-test1
\ No newline at end of file
+test1 测试1
\ No newline at end of file

From 3c976d5bda3db69577e96e3eb71e01a550e85fdd Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:56:39 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test1 b/doc/test1
index 9796d4871..4e5f6fe4e 100644
--- a/doc/test1
+++ b/doc/test1
@@ -1 +1 @@
-test1 测试1
\ No newline at end of file
+test1 测试1 11
\ No newline at end of file

From 3cdc045a095c69e36061d2c5ce88caaf32bdfef1 Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:57:58 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test b/doc/test
index c2d74f151..440afeb14 100644
--- a/doc/test
+++ b/doc/test
@@ -1 +1 @@
-ceshiwenjhhhe 基础版本 测试
\ No newline at end of file
+ceshiwenjhhhe 基础版本 测试 1212121212
\ No newline at end of file

From cc2534d0e9c5be10894dab6bb81258d25d4e71bc Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 20:59:43 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test1 b/doc/test1
index 4e5f6fe4e..ce1407386 100644
--- a/doc/test1
+++ b/doc/test1
@@ -1 +1 @@
-test1 测试1 11
\ No newline at end of file
+test1 测试1 11111111111111
\ No newline at end of file

From 7dd321c5ec7063104549c185bda8f703cd1d057c Mon Sep 17 00:00:00 2001
From: "704109007@qq.com" <199302zf>
Date: Sun, 18 Oct 2020 21:19:29 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/test b/doc/test
index 440afeb14..30d74d258 100644
--- a/doc/test
+++ b/doc/test
@@ -1 +1 @@
-ceshiwenjhhhe 基础版本 测试 1212121212
\ No newline at end of file
+test
\ No newline at end of file