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

疯狂的狮子li

2021-12-28 c4cfaab621472478171bfa731996e032812ef5b4

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

@@ -6,7 +6,7 @@
/**
 * 用户与角色关联表 数据层
 *
 * @author ruoyi
 * @author Lion Li
 */
public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> {