Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Administrator
/
framework-tools
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2646bfeb
authored
Jul 09, 2024
by
henry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决冲突
1 parent
cc7184dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/MybatisConfig.java
arch-overall/src/main/java/org/arch/overall/mapper/ArchiTotalAssetMapper.java
arch-clouds/mybatis/src/main/java/org/arch/mybatis/config/MybatisConfig.java
View file @
2646bfe
...
...
@@ -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配置..."
);
...
...
arch-overall/src/main/java/org/arch/overall/mapper/ArchiTotalAssetMapper.java
View file @
2646bfe
...
...
@@ -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
{
/**
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment