diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml
index 30a4b2c8..37e28fb9 100644
--- a/api/erp-api/pom.xml
+++ b/api/erp-api/pom.xml
@@ -126,7 +126,11 @@
poi-ooxml
5.2.5
-
+
+ cn.qihangerp.service
+ service
+ 2.0.0
+
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java b/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java
index 027fd9c7..80d391dd 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@Configuration
-@MapperScan({"cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
+@MapperScan({"cn.qihangerp.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
public class MybatisPlusConfig {
@Primary
@Bean
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java
index 2aff635e..4f2417d7 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java
@@ -1,15 +1,13 @@
package cn.qihangerp.erp.controller;
-
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.TableDataInfo;
-
import cn.qihangerp.model.entity.ErpStockIn;
import cn.qihangerp.model.request.StockInCreateRequest;
import cn.qihangerp.model.request.StockInRequest;
-import cn.qihangerp.module.stock.service.ErpStockInService;
+import cn.qihangerp.module.service.ErpStockInService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java
index 4f75e7e2..f89e70dd 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java
@@ -7,7 +7,7 @@ import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.ErpStockOut;
import cn.qihangerp.model.request.StockOutCreateRequest;
import cn.qihangerp.model.request.StockOutItemRequest;
-import cn.qihangerp.module.stock.service.ErpStockOutService;
+import cn.qihangerp.module.service.ErpStockOutService;
import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java
index e63eab36..2805260f 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java
@@ -1,12 +1,11 @@
package cn.qihangerp.erp.controller;
-
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.ErpWarehouse;
import cn.qihangerp.model.entity.ErpWarehousePosition;
-import cn.qihangerp.module.stock.service.ErpWarehousePositionService;
-import cn.qihangerp.module.stock.service.ErpWarehouseService;
+import cn.qihangerp.module.service.ErpWarehousePositionService;
+import cn.qihangerp.module.service.ErpWarehouseService;
import cn.qihangerp.security.common.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java
index 3b6170c1..8261d55a 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java
@@ -1,69 +1,69 @@
-package cn.qihangerp.erp.serviceImpl;
-
-import cn.qihangerp.model.entity.SysConfig;
-import cn.qihangerp.service.SysConfigService;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-@Service
-public class SysConfigServiceImpl implements SysConfigService {
- @Override
- public boolean selectCaptchaEnabled() {
- return false;
- }
-
- @Override
- public boolean saveBatch(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean saveOrUpdateBatch(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean updateBatchById(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean saveOrUpdate(SysConfig entity) {
- return false;
- }
-
- @Override
- public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) {
- return null;
- }
-
- @Override
- public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) {
- return Optional.empty();
- }
-
- @Override
- public Map getMap(Wrapper queryWrapper) {
- return Map.of();
- }
-
- @Override
- public V getObj(Wrapper queryWrapper, Function super Object, V> mapper) {
- return null;
- }
-
- @Override
- public BaseMapper getBaseMapper() {
- return null;
- }
-
- @Override
- public Class getEntityClass() {
- return null;
- }
-}
+//package cn.qihangerp.erp.serviceImpl;
+//
+//import cn.qihangerp.model.entity.SysConfig;
+//import cn.qihangerp.service.SysConfigService;
+//import com.baomidou.mybatisplus.core.conditions.Wrapper;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.Collection;
+//import java.util.Map;
+//import java.util.Optional;
+//import java.util.function.Function;
+//@Service
+//public class SysConfigServiceImpl implements SysConfigService {
+// @Override
+// public boolean selectCaptchaEnabled() {
+// return false;
+// }
+//
+// @Override
+// public boolean saveBatch(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean saveOrUpdateBatch(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean updateBatchById(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean saveOrUpdate(SysConfig entity) {
+// return false;
+// }
+//
+// @Override
+// public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) {
+// return null;
+// }
+//
+// @Override
+// public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) {
+// return Optional.empty();
+// }
+//
+// @Override
+// public Map getMap(Wrapper queryWrapper) {
+// return Map.of();
+// }
+//
+// @Override
+// public V getObj(Wrapper queryWrapper, Function super Object, V> mapper) {
+// return null;
+// }
+//
+// @Override
+// public BaseMapper getBaseMapper() {
+// return null;
+// }
+//
+// @Override
+// public Class getEntityClass() {
+// return null;
+// }
+//}
diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java
index a82d2ee5..29cf10b5 100644
--- a/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java
@@ -1,123 +1,123 @@
-package cn.qihangerp.erp.serviceImpl;
-
-import cn.qihangerp.model.entity.SysUser;
-import cn.qihangerp.service.ISysUserService;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户 业务层处理
- *
- * @author qihang
- */
-@Service
-public class SysUserServiceImpl implements ISysUserService
-{
-
- @Override
- public List selectUserList(SysUser user) {
- return List.of();
- }
-
- @Override
- public List selectAllocatedList(SysUser user) {
- return List.of();
- }
-
- @Override
- public List selectUnallocatedList(SysUser user) {
- return List.of();
- }
-
- @Override
- public SysUser selectUserByUserName(String userName) {
- return null;
- }
-
- @Override
- public SysUser selectUserById(Long userId) {
- return null;
- }
-
- @Override
- public boolean checkUserNameUnique(SysUser user) {
- return false;
- }
-
- @Override
- public boolean checkPhoneUnique(SysUser user) {
- return false;
- }
-
- @Override
- public boolean checkEmailUnique(SysUser user) {
- return false;
- }
-
- @Override
- public void checkUserAllowed(SysUser user) {
-
- }
-
- @Override
- public int insertUser(SysUser user) {
- return 0;
- }
-
- @Override
- public boolean registerUser(SysUser user) {
- return false;
- }
-
- @Override
- public int updateUser(SysUser user) {
- return 0;
- }
-
- @Override
- public int updateUserStatus(SysUser user) {
- return 0;
- }
-
- @Override
- public int updateUserProfile(SysUser user) {
- return 0;
- }
-
- @Override
- public boolean updateUserAvatar(String userName, String avatar) {
- return false;
- }
-
- @Override
- public int resetPwd(SysUser user) {
- return 0;
- }
-
- @Override
- public int resetUserPwd(String userName, String password) {
- return 0;
- }
-
- @Override
- public int deleteUserById(Long userId) {
- return 0;
- }
-
- @Override
- public void checkUserDataScope(Long userId) {
-
- }
-
- @Override
- public String selectUserRoleGroup(String userName) {
- return "";
- }
-
- @Override
- public void insertUserAuth(Long userId, Long[] roleIds) {
-
- }
-}
+//package cn.qihangerp.erp.serviceImpl;
+//
+//import cn.qihangerp.model.entity.SysUser;
+//import cn.qihangerp.service.ISysUserService;
+//
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+///**
+// * 用户 业务层处理
+// *
+// * @author qihang
+// */
+//@Service
+//public class SysUserServiceImpl implements ISysUserService
+//{
+//
+// @Override
+// public List selectUserList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public List selectAllocatedList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public List selectUnallocatedList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public SysUser selectUserByUserName(String userName) {
+// return null;
+// }
+//
+// @Override
+// public SysUser selectUserById(Long userId) {
+// return null;
+// }
+//
+// @Override
+// public boolean checkUserNameUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public boolean checkPhoneUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public boolean checkEmailUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public void checkUserAllowed(SysUser user) {
+//
+// }
+//
+// @Override
+// public int insertUser(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public boolean registerUser(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public int updateUser(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int updateUserStatus(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int updateUserProfile(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public boolean updateUserAvatar(String userName, String avatar) {
+// return false;
+// }
+//
+// @Override
+// public int resetPwd(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int resetUserPwd(String userName, String password) {
+// return 0;
+// }
+//
+// @Override
+// public int deleteUserById(Long userId) {
+// return 0;
+// }
+//
+// @Override
+// public void checkUserDataScope(Long userId) {
+//
+// }
+//
+// @Override
+// public String selectUserRoleGroup(String userName) {
+// return "";
+// }
+//
+// @Override
+// public void insertUserAuth(Long userId, Long[] roleIds) {
+//
+// }
+//}
diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java
index 7be654ae..34990a13 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java
@@ -1,69 +1,69 @@
-package cn.qihangerp.oms.service;
-
-import cn.qihangerp.model.entity.SysConfig;
-import cn.qihangerp.service.SysConfigService;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-@Service
-public class SysConfigServiceImpl implements SysConfigService {
- @Override
- public boolean selectCaptchaEnabled() {
- return false;
- }
-
- @Override
- public boolean saveBatch(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean saveOrUpdateBatch(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean updateBatchById(Collection entityList, int batchSize) {
- return false;
- }
-
- @Override
- public boolean saveOrUpdate(SysConfig entity) {
- return false;
- }
-
- @Override
- public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) {
- return null;
- }
-
- @Override
- public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) {
- return Optional.empty();
- }
-
- @Override
- public Map getMap(Wrapper queryWrapper) {
- return Map.of();
- }
-
- @Override
- public V getObj(Wrapper queryWrapper, Function super Object, V> mapper) {
- return null;
- }
-
- @Override
- public BaseMapper getBaseMapper() {
- return null;
- }
-
- @Override
- public Class getEntityClass() {
- return null;
- }
-}
+//package cn.qihangerp.oms.service;
+//
+//import cn.qihangerp.model.entity.SysConfig;
+//import cn.qihangerp.service.SysConfigService;
+//import com.baomidou.mybatisplus.core.conditions.Wrapper;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.Collection;
+//import java.util.Map;
+//import java.util.Optional;
+//import java.util.function.Function;
+//@Service
+//public class SysConfigServiceImpl implements SysConfigService {
+// @Override
+// public boolean selectCaptchaEnabled() {
+// return false;
+// }
+//
+// @Override
+// public boolean saveBatch(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean saveOrUpdateBatch(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean updateBatchById(Collection entityList, int batchSize) {
+// return false;
+// }
+//
+// @Override
+// public boolean saveOrUpdate(SysConfig entity) {
+// return false;
+// }
+//
+// @Override
+// public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) {
+// return null;
+// }
+//
+// @Override
+// public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) {
+// return Optional.empty();
+// }
+//
+// @Override
+// public Map getMap(Wrapper queryWrapper) {
+// return Map.of();
+// }
+//
+// @Override
+// public V getObj(Wrapper queryWrapper, Function super Object, V> mapper) {
+// return null;
+// }
+//
+// @Override
+// public BaseMapper getBaseMapper() {
+// return null;
+// }
+//
+// @Override
+// public Class getEntityClass() {
+// return null;
+// }
+//}
diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java
index 649c15a5..c3b87d7d 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java
@@ -1,122 +1,122 @@
-package cn.qihangerp.oms.service;
-
-import cn.qihangerp.model.entity.SysUser;
-import cn.qihangerp.service.ISysUserService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户 业务层处理
- *
- * @author qihang
- */
-@Service
-public class SysUserServiceImpl implements ISysUserService
-{
-
- @Override
- public List selectUserList(SysUser user) {
- return List.of();
- }
-
- @Override
- public List selectAllocatedList(SysUser user) {
- return List.of();
- }
-
- @Override
- public List selectUnallocatedList(SysUser user) {
- return List.of();
- }
-
- @Override
- public SysUser selectUserByUserName(String userName) {
- return null;
- }
-
- @Override
- public SysUser selectUserById(Long userId) {
- return null;
- }
-
- @Override
- public boolean checkUserNameUnique(SysUser user) {
- return false;
- }
-
- @Override
- public boolean checkPhoneUnique(SysUser user) {
- return false;
- }
-
- @Override
- public boolean checkEmailUnique(SysUser user) {
- return false;
- }
-
- @Override
- public void checkUserAllowed(SysUser user) {
-
- }
-
- @Override
- public int insertUser(SysUser user) {
- return 0;
- }
-
- @Override
- public boolean registerUser(SysUser user) {
- return false;
- }
-
- @Override
- public int updateUser(SysUser user) {
- return 0;
- }
-
- @Override
- public int updateUserStatus(SysUser user) {
- return 0;
- }
-
- @Override
- public int updateUserProfile(SysUser user) {
- return 0;
- }
-
- @Override
- public boolean updateUserAvatar(String userName, String avatar) {
- return false;
- }
-
- @Override
- public int resetPwd(SysUser user) {
- return 0;
- }
-
- @Override
- public int resetUserPwd(String userName, String password) {
- return 0;
- }
-
- @Override
- public int deleteUserById(Long userId) {
- return 0;
- }
-
- @Override
- public void checkUserDataScope(Long userId) {
-
- }
-
- @Override
- public String selectUserRoleGroup(String userName) {
- return "";
- }
-
- @Override
- public void insertUserAuth(Long userId, Long[] roleIds) {
-
- }
-}
+//package cn.qihangerp.oms.service;
+//
+//import cn.qihangerp.model.entity.SysUser;
+//import cn.qihangerp.service.ISysUserService;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+///**
+// * 用户 业务层处理
+// *
+// * @author qihang
+// */
+//@Service
+//public class SysUserServiceImpl implements ISysUserService
+//{
+//
+// @Override
+// public List selectUserList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public List selectAllocatedList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public List selectUnallocatedList(SysUser user) {
+// return List.of();
+// }
+//
+// @Override
+// public SysUser selectUserByUserName(String userName) {
+// return null;
+// }
+//
+// @Override
+// public SysUser selectUserById(Long userId) {
+// return null;
+// }
+//
+// @Override
+// public boolean checkUserNameUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public boolean checkPhoneUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public boolean checkEmailUnique(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public void checkUserAllowed(SysUser user) {
+//
+// }
+//
+// @Override
+// public int insertUser(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public boolean registerUser(SysUser user) {
+// return false;
+// }
+//
+// @Override
+// public int updateUser(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int updateUserStatus(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int updateUserProfile(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public boolean updateUserAvatar(String userName, String avatar) {
+// return false;
+// }
+//
+// @Override
+// public int resetPwd(SysUser user) {
+// return 0;
+// }
+//
+// @Override
+// public int resetUserPwd(String userName, String password) {
+// return 0;
+// }
+//
+// @Override
+// public int deleteUserById(Long userId) {
+// return 0;
+// }
+//
+// @Override
+// public void checkUserDataScope(Long userId) {
+//
+// }
+//
+// @Override
+// public String selectUserRoleGroup(String userName) {
+// return "";
+// }
+//
+// @Override
+// public void insertUserAuth(Long userId, Long[] roleIds) {
+//
+// }
+//}
diff --git a/api/sys-api/pom.xml b/api/sys-api/pom.xml
index d89a28c1..7da76517 100644
--- a/api/sys-api/pom.xml
+++ b/api/sys-api/pom.xml
@@ -189,11 +189,11 @@
security
1.0
-
- cn.qihangerp.service
- sys
- 2.0.0
-
+
+
+
+
+
cn.qihangerp.service
service
diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDeptController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDeptController.java
index 107f0321..1f998f7b 100644
--- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDeptController.java
+++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDeptController.java
@@ -3,7 +3,7 @@ package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.StringUtils;
-import cn.qihangerp.module.domain.SysDept;
+import cn.qihangerp.model.SysDept;
import cn.qihangerp.module.service.ISysDeptService;
import cn.qihangerp.security.common.BaseController;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java
index 81f7582d..0719f4b3 100644
--- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java
+++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysDictTypeController.java
@@ -4,7 +4,7 @@ package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo;
-import cn.qihangerp.module.domain.SysDictType;
+import cn.qihangerp.model.SysDictType;
import cn.qihangerp.module.service.ISysDictTypeService;
import cn.qihangerp.security.common.BaseController;
diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java
index 07609659..1e73e7bf 100644
--- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java
+++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysLoginController.java
@@ -1,8 +1,8 @@
package cn.qihangerp.sys.controller;
import cn.qihangerp.model.entity.SysUser;
-import cn.qihangerp.module.domain.LoginBody;
-import cn.qihangerp.module.domain.SysMenu;
+import cn.qihangerp.model.LoginBody;
+import cn.qihangerp.model.SysMenu;
import cn.qihangerp.module.service.ISysMenuService;
import cn.qihangerp.module.service.SysPermissionService;
import cn.qihangerp.security.common.Constants;
diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java
index 6073745d..fbf82214 100644
--- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java
+++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysMenuController.java
@@ -6,7 +6,7 @@ package cn.qihangerp.sys.controller;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.constant.UserConstants;
import cn.qihangerp.common.utils.StringUtils;
-import cn.qihangerp.module.domain.SysMenu;
+import cn.qihangerp.model.SysMenu;
import cn.qihangerp.module.service.ISysMenuService;
import cn.qihangerp.security.common.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java
index 2295c2f2..19541004 100644
--- a/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java
+++ b/api/sys-api/src/main/java/cn/qihangerp/sys/controller/SysRoleController.java
@@ -5,8 +5,8 @@ import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.model.entity.SysRole;
import cn.qihangerp.model.entity.SysUser;
-import cn.qihangerp.module.domain.SysDept;
-import cn.qihangerp.module.domain.SysUserRole;
+import cn.qihangerp.model.SysDept;
+import cn.qihangerp.model.SysUserRole;
import cn.qihangerp.module.service.ISysDeptService;
import cn.qihangerp.module.service.ISysRoleService;
import cn.qihangerp.module.service.SysPermissionService;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysConfigMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysConfigMapper.java
similarity index 90%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysConfigMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysConfigMapper.java
index 4fb45020..4a8033e1 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysConfigMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysConfigMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.SysConfig;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDeptMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysDeptMapper.java
similarity index 97%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDeptMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysDeptMapper.java
index f0f61b5a..0602bbce 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDeptMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysDeptMapper.java
@@ -1,7 +1,7 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysDept;
+import cn.qihangerp.model.SysDept;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysDictDataMapper.java
similarity index 98%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysDictDataMapper.java
index 5ad6e9db..032dbb01 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictDataMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysDictDataMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.SysDictData;
import org.apache.ibatis.annotations.Param;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictTypeMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysDictTypeMapper.java
similarity index 95%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictTypeMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysDictTypeMapper.java
index 0a7ec42c..06ab6b92 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysDictTypeMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysDictTypeMapper.java
@@ -1,9 +1,9 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysDictType;
+import cn.qihangerp.model.SysDictType;
import java.util.List;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysMenuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysMenuMapper.java
similarity index 97%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysMenuMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysMenuMapper.java
index a0b2e286..eb09779c 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysMenuMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysMenuMapper.java
@@ -1,8 +1,8 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysMenu;
+import cn.qihangerp.model.SysMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysOssMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysOssMapper.java
similarity index 79%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysOssMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysOssMapper.java
index e39ffa57..c4b0318c 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysOssMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysOssMapper.java
@@ -1,7 +1,7 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysOss;
+import cn.qihangerp.model.SysOss;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysRoleMapper.java
similarity index 98%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysRoleMapper.java
index b845d53e..4c454860 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysRoleMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.SysRole;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMenuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysRoleMenuMapper.java
similarity index 90%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMenuMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysRoleMenuMapper.java
index 0709e4ba..ba8cd1dd 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysRoleMenuMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysRoleMenuMapper.java
@@ -1,9 +1,9 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysRoleMenu;
+import cn.qihangerp.model.SysRoleMenu;
import java.util.List;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysUserMapper.java
similarity index 98%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysUserMapper.java
index 3b182391..d74ba5ed 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysUserMapper.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.SysUser;
import org.apache.ibatis.annotations.Mapper;
diff --git a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserRoleMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/SysUserRoleMapper.java
similarity index 94%
rename from serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserRoleMapper.java
rename to mapper/src/main/java/cn/qihangerp/mapper/SysUserRoleMapper.java
index bc69c20a..ae73fc5f 100644
--- a/serviceImpl/sys/src/main/java/cn/qihangerp/module/mapper/SysUserRoleMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/SysUserRoleMapper.java
@@ -1,7 +1,7 @@
-package cn.qihangerp.module.mapper;
+package cn.qihangerp.mapper;
-import cn.qihangerp.module.domain.SysUserRole;
+import cn.qihangerp.model.SysUserRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/mapper/src/main/resources/mapper/OOrderMapper.xml b/mapper/src/main/resources/mapper/OOrderMapper.xml
index 239782b1..05c0a28f 100644
--- a/mapper/src/main/resources/mapper/OOrderMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderMapper.xml
@@ -73,7 +73,7 @@
diff --git a/serviceImpl/sys/src/main/resources/mapper/SysConfigMapper.xml b/mapper/src/main/resources/mapper/SysConfigMapper.xml
similarity index 95%
rename from serviceImpl/sys/src/main/resources/mapper/SysConfigMapper.xml
rename to mapper/src/main/resources/mapper/SysConfigMapper.xml
index 4c028531..fe64f8e8 100644
--- a/serviceImpl/sys/src/main/resources/mapper/SysConfigMapper.xml
+++ b/mapper/src/main/resources/mapper/SysConfigMapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/serviceImpl/sys/src/main/resources/mapper/SysDeptMapper.xml b/mapper/src/main/resources/mapper/SysDeptMapper.xml
similarity index 93%
rename from serviceImpl/sys/src/main/resources/mapper/SysDeptMapper.xml
rename to mapper/src/main/resources/mapper/SysDeptMapper.xml
index cffd0f37..40aa76cc 100644
--- a/serviceImpl/sys/src/main/resources/mapper/SysDeptMapper.xml
+++ b/mapper/src/main/resources/mapper/SysDeptMapper.xml
@@ -2,9 +2,9 @@
-
+
-
+
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_dept d
-