解决 代码冲突

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysConfigController.java

@@ -1,7 +1,6 @@
 package com.usky.system.controller.web;
 
 
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPlatformController.java

@@ -1,7 +1,6 @@
 package com.usky.system.controller.web;
 
 
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.system.domain.SysMenu;

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysNotice.java

@@ -1,7 +1,7 @@
 package com.usky.system.domain;
 
 
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.usky.common.core.bean.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictDataMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysNoticeMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysNotice;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysTenantMenuMapper.java

@@ -1,6 +1,6 @@
 package com.usky.system.mapper;
 
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysTenantMenu;
 
 /**

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.usky.system.mapper;
 
 
 import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserPostMapper.java

@@ -1,7 +1,7 @@
 package com.usky.system.mapper;
 
 
-import com.usky.common.mvc.base.CrudMapper;
+import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysUserPost;
 import org.springframework.stereotype.Repository;
 

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictDataService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysDictData;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysNoticeService.java

@@ -1,7 +1,7 @@
 package com.usky.system.service;
 
 
-import com.usky.common.mvc.base.CrudService;
+import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysNotice;
 
 import java.util.List;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.usky.system.service.impl;
 
 
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.SysNotice;
 import com.usky.system.mapper.SysNoticeMapper;
 import com.usky.system.service.ISysNoticeService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantMenuServiceImpl.java

@@ -1,6 +1,6 @@
 package com.usky.system.service.impl;
 
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.domain.SysTenantMenu;
 import com.usky.system.mapper.SysTenantMenuMapper;
 import com.usky.system.service.SysTenantMenuService;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -1,8 +1,8 @@
 package com.usky.system.service.impl;
 
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysTenant;
 import com.usky.system.mapper.SysTenantMapper;
 import com.usky.system.service.SysTenantService;