!6 同步develop分支

* sync -- 同步develop分支

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -1,6 +1,5 @@
 package com.ruoyi.system.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -14,7 +13,7 @@ import java.util.Set;
  *
  * @author Lion Li
  */
-public interface ISysRoleService extends IService<SysRole> {
+public interface ISysRoleService {
 
 
     TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery);