Commit 2646bfeb by henry

解决冲突

1 parent cc7184dc
......@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Properties;
@Slf4j
@Configuration
@MapperScan(basePackages = {"org.arch.mybatis.*.mapper","org.arch.mybatis.**.mapper"})
@MapperScan(basePackages = {"org.arch.*.*.mapper","org.arch.**.mapper"})
public class MybatisConfig {
public MybatisConfig() {
log.info("加载MybatisPlus配置...");
......
......@@ -2,6 +2,7 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.asset.ArchiAssetDTO;
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 java.util.List;
@Mapper
public interface ArchiTotalAssetMapper extends BaseMapper {
/**
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!