Merge remote-tracking branch 'origin/master'

liusheng

2026-01-26 0e811615b93c04188ba520b2ba6b89b0d186f80b

 smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml

@@ -26,11 +26,10 @@
    <select id="selectUserRoleByRoleIdAndUserId" resultMap="SysUserRoleResult">
        select user_id,role_id,guid,orgid
        from sys_user_role
        <where>
        where 1=1
            <if test="roleId != null ">and role_id = #{roleId}</if>
            <if test="userId != null ">and user_id = #{userId}</if>

        </where>
    </select>

    <delete id="deleteUserRole" parameterType="Long">