From 9351d47948e1421f308eac1fa761b18b621580a9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 14:10:53 +0800
Subject: [PATCH] fix 修复 合并错误

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 3d41141..3066f47 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -9,4 +9,4 @@
         <result property="roleId" column="role_id"/>
     </resultMap>
 
-</mapper> 
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3