Merge remote-tracking branch 'origin/master'

lohir

2024-10-18 1a00df812740751806e6d17a7b5a184fe97157d4

 src/main/resources/mapper/UserEventLogMapper.xml

@@ -32,8 +32,8 @@
            <if test="userId != null">
                and user_id= #{userId}
            </if>
            <if test="userName != null">
                and user_name= #{userName}
            <if test="realName != null">
                and real_name like  concat('%', #{realName} , '%')
            </if>
        </where>
    </select>