From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index cace1f5..e64cb45 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -9,11 +9,4 @@
<result property="deptId" column="dept_id"/>
</resultMap>
- <insert id="batchRoleDept">
- insert into sys_role_dept(role_id, dept_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.deptId})
- </foreach>
- </insert>
-
</mapper>
--
Gitblit v1.9.3