fix 修复升级合并错误

疯狂的狮子li

2021-07-12 cd34c87afa730c48e2b2be61d700b1fee409e02c

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

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

import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleMenu;

/**