Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 ff8edc9c28ad4f2b98b2cba014af267fd6ba41da

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.model.SysUserRole;
import com.ruoyi.system.domain.SysUserRole;
import org.apache.ibatis.annotations.Param;

import java.util.List;