Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-16 c017a38ce24bfae8e9d1729210da8511ba85d29e

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.model.SysUserRole;
import com.ruoyi.system.domain.SysUserRole;

import java.util.List;