Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-05-31 f3aaa7ea7a0f56ff4a6f9faf057a6595ab3275a7

 ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,4 +9,11 @@
        <result property="roleId" column="role_id"/>
    </resultMap>

</mapper> 
    <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>

</mapper>