解决冲突

arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/MybatisConfig.java

@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
 import java.util.Properties;
 import java.util.Properties;
 @Slf4j
 @Slf4j
 @Configuration
 @Configuration
-@MapperScan(basePackages = {"org.arch.mybatis.*.mapper","org.arch.mybatis.**.mapper"})
+@MapperScan(basePackages = {"org.arch.*.*.mapper","org.arch.**.mapper"})
 public class MybatisConfig {
 public class MybatisConfig {
     public MybatisConfig() {
     public MybatisConfig() {
         log.info("加载MybatisPlus配置...");
         log.info("加载MybatisPlus配置...");

arch-overall/src/main/java/org/arch/overall/mapper/ArchiTotalAssetMapper.java

@@ -2,6 +2,7 @@ package org.arch.overall.mapper;
 
 
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetDTO;
 import org.arch.common.modules.archoverall.dto.asset.ArchiAssetDTO;
 import org.arch.common.modules.archoverall.dto.design.ArchiViewDTO;
 import org.arch.common.modules.archoverall.dto.design.ArchiViewDTO;
@@ -10,7 +11,7 @@ import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
 import org.arch.common.modules.archoverall.vo.ArchiViewVO;
 import org.arch.common.modules.archoverall.vo.ArchiViewVO;
 
 
 import java.util.List;
 import java.util.List;
-
+@Mapper
 public interface ArchiTotalAssetMapper extends BaseMapper {
 public interface ArchiTotalAssetMapper extends BaseMapper {
 
 
     /**
     /**