Skip to content

A
amos-boot-biz
Commit 3e528d80 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parent 98861ba5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @ 3e528d80
...@@ -8,18 +8,14 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUserVO; ...@@ -8,18 +8,14 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUserVO;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTPDlExcelDto; import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTPDlExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.UserVO; import com.yeejoin.amos.boot.module.common.api.dto.UserVO;
import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto; import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto;
<<<<<<< HEAD
import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto; import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic; import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
=======
import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonUser; import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonUser;
import com.yeejoin.amos.boot.module.jxiop.api.entity.*; import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
>>>>>>> a5d8520121e78a54ff1c3179fe3673aaa18c6ab9
import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonAccountService; import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonAccountService;
import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService; import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonBasicDto; import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonBasicDto;
<<<<<<< HEAD
import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient; import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
import com.yeejoin.amos.feign.privilege.util.DesUtil; import com.yeejoin.amos.feign.privilege.util.DesUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment