chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
石璞臻 2024-11-20 10:53:59 +08:00
parent 18dab91f3b
commit 15733c9a6b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java
View File

@ -43,10 +43,10 @@ public interface UserRepository {
/**
* 查询用户
* @param searchKeywords
* @param searchKeyWords
* @return
*/
List<User> search(SearchKeyWords searchKeywords);
List<User> search(SearchKeyWords searchKeyWords);
/**
* 删除用户

5
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
View File

@ -83,11 +83,11 @@ public class UserServiceImpl implements UserService {
/**
* 查询用户信息
* @param searchKeywords
* @param searchKeyWords
* @return
*/
@Override
public List<User> searchUser(SearchKeywords searchKeywords) { return userRepository.search(searchKeywords); }
public List<User> searchUser(SearchKeyWords searchKeyWords) { return userRepository.search(searchKeyWords); }
/**
* 根据userId逻辑删除用户
@ -99,5 +99,4 @@ public class UserServiceImpl implements UserService {
public Boolean deleteUser(String userId) {
return userRepository.deleteUser(userId)>0;
}
public List<User> searchUser(SearchKeyWords searchKeywords) { return userRepository.search(searchKeywords); }
}

2
service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java
View File

@ -16,7 +16,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2024-11-20T10:18:06+0800",
date = "2024-11-20T10:52:53+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_271 (Oracle Corporation)"
)
public class UserMappersImpl implements UserMappers {