From 32e256d44e014f848ccda6f5d09ad2c3392d42fd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 13:35:42 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleMenuService.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/HostServiceImpl.java | 12 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java | 10
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserRoleMapper.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Host.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/MenuServiceImpl.java | 12 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/BaseController.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/OperationRecordMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/HostMapper.java | 4
zy-asrs-wcs/src/main/resources/mapper/system/OperationRecordMapper.xml | 2
zy-asrs-framework/src/main/resources/templates/react/Controller.txt | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserLoginMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/HostService.java | 8 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Role.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/OperationRecordServiceImpl.java | 8
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/LoginParam.java | 2
zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml | 2
zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml | 4
zy-asrs-wcs/src/main/resources/mapper/system/DeptMapper.xml | 2
zy-asrs-wcs/src/main/resources/mapper/system/RoleMenuMapper.xml | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/result/LoginResult.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMapper.java | 4
zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java | 20 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMenuMapper.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java | 8
zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DeptService.java | 8 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleMenuServiceImpl.java | 10
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/UpdatePasswordParam.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/MenuService.java | 8 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserRole.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java | 12 +-
zy-asrs-wcs/src/main/resources/mapper/system/UserRoleMapper.xml | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java | 8
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/RoleParam.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/RoleMenu.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleService.java | 8 +
/dev/null | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserRoleServiceImpl.java | 10
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserRoleService.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DeptServiceImpl.java | 12 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/MenuMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/OperationRecordService.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DeptMapper.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleServiceImpl.java | 12 ++
59 files changed, 205 insertions(+), 130 deletions(-)
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Controller.txt b/zy-asrs-framework/src/main/resources/templates/react/Controller.txt
index b5f7a2c..61ae217 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Controller.txt
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.controller;
+package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.service.RoleService;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
index 33c38d5..a698bbb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
@@ -4,9 +4,9 @@
import com.zy.asrs.common.utils.IpTools;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.entity.OperationRecord;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.service.OperationRecordService;
+import com.zy.asrs.wcs.system.entity.OperationRecord;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.service.OperationRecordService;
import com.zy.asrs.wcs.utils.Utils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.*;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
index cbe345a..2f81dd6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.NullValue;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
index 91b8954..accf7d8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/JwtAuthenticationFilter.java
@@ -3,11 +3,11 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.common.config.ConfigProperties;
import com.zy.asrs.wcs.common.constant.Constants;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.entity.UserLogin;
-import com.zy.asrs.wcs.sys.service.UserLoginService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.UserLoginService;
+import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.HttpUtils;
import com.zy.asrs.wcs.utils.JwtUtil;
import io.jsonwebtoken.Claims;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/DeptService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/DeptService.java
deleted file mode 100644
index c6fc874..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/DeptService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.wcs.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Dept;
-
-public interface DeptService extends IService<Dept> {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/HostService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/HostService.java
deleted file mode 100644
index c51578d..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/HostService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.wcs.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Host;
-
-public interface HostService extends IService<Host> {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/MenuService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/MenuService.java
deleted file mode 100644
index 82e2b10..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/MenuService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.wcs.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Menu;
-
-public interface MenuService extends IService<Menu> {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleService.java
deleted file mode 100644
index 898efa1..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.wcs.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Role;
-
-public interface RoleService extends IService<Role> {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/DeptServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/DeptServiceImpl.java
deleted file mode 100644
index 95b5e3d..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/DeptServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wcs.sys.service.impl;
-
-import com.zy.asrs.wcs.sys.mapper.DeptMapper;
-import com.zy.asrs.wcs.sys.entity.Dept;
-import com.zy.asrs.wcs.sys.service.DeptService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("deptService")
-public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/HostServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/HostServiceImpl.java
deleted file mode 100644
index 5f6a32f..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/HostServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wcs.sys.service.impl;
-
-import com.zy.asrs.wcs.sys.mapper.HostMapper;
-import com.zy.asrs.wcs.sys.entity.Host;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("hostService")
-public class HostServiceImpl extends ServiceImpl<HostMapper, Host> implements HostService {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/MenuServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/MenuServiceImpl.java
deleted file mode 100644
index d2583d7..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/MenuServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wcs.sys.service.impl;
-
-import com.zy.asrs.wcs.sys.mapper.MenuMapper;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.service.MenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("menuService")
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleServiceImpl.java
deleted file mode 100644
index 2baf5d9..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.wcs.sys.service.impl;
-
-import com.zy.asrs.wcs.sys.mapper.RoleMapper;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("roleService")
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
similarity index 87%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
index bfb8500..d2806d5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/AuthController.java
@@ -1,19 +1,19 @@
-package com.zy.asrs.wcs.sys.controller;
+package com.zy.asrs.wcs.system.controller;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.config.ConfigProperties;
import com.zy.asrs.wcs.common.security.JwtSubject;
-import com.zy.asrs.wcs.sys.controller.param.LoginParam;
-import com.zy.asrs.wcs.sys.controller.param.UpdatePasswordParam;
-import com.zy.asrs.wcs.sys.controller.result.LoginResult;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.entity.UserLogin;
-import com.zy.asrs.wcs.sys.service.RoleMenuService;
-import com.zy.asrs.wcs.sys.service.UserLoginService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.controller.param.LoginParam;
+import com.zy.asrs.wcs.system.controller.param.UpdatePasswordParam;
+import com.zy.asrs.wcs.system.controller.result.LoginResult;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.RoleMenuService;
+import com.zy.asrs.wcs.system.service.UserLoginService;
+import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.JwtUtil;
import com.zy.asrs.wcs.utils.Utils;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/BaseController.java
similarity index 93%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/BaseController.java
index c92bde7..4d85dbd 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/BaseController.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.sys.controller;
+package com.zy.asrs.wcs.system.controller;
import com.zy.asrs.wcs.common.domain.BaseParam;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/HostController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
similarity index 91%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/HostController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
index 99b251d..27a38ad 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/HostController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
@@ -1,12 +1,12 @@
-package com.zy.asrs.wcs.sys.controller;
+package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.domain.KeyValVo;
-import com.zy.asrs.wcs.sys.entity.Host;
-import com.zy.asrs.wcs.sys.service.HostService;
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.service.HostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
index b5f7a2c..61ae217 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.controller;
+package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.service.RoleService;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/LoginParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/LoginParam.java
similarity index 85%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/LoginParam.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/LoginParam.java
index 8384a69..a046005 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/LoginParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/LoginParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.controller.param;
+package com.zy.asrs.wcs.system.controller.param;
import lombok.Data;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/RoleParam.java
similarity index 84%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/RoleParam.java
index 829d670..f2f9f02 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/RoleParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.controller.param;
+package com.zy.asrs.wcs.system.controller.param;
import com.zy.asrs.wcs.common.domain.BaseParam;
import lombok.Data;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/UpdatePasswordParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/UpdatePasswordParam.java
similarity index 82%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/UpdatePasswordParam.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/UpdatePasswordParam.java
index 4931a0f..501e963 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/UpdatePasswordParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/UpdatePasswordParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.controller.param;
+package com.zy.asrs.wcs.system.controller.param;
import lombok.Data;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/result/LoginResult.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/result/LoginResult.java
similarity index 79%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/result/LoginResult.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/result/LoginResult.java
index 9a9b5f0..602aac8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/result/LoginResult.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/result/LoginResult.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.controller.result;
+package com.zy.asrs.wcs.system.controller.result;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Dept.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
similarity index 97%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Dept.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
index 149c285..852affa 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Dept.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Host.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Host.java
similarity index 98%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Host.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Host.java
index 8a1c6f8..0f38f07 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Host.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Host.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Menu.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
similarity index 97%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Menu.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
index 26bedd4..77d6a72 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Menu.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
@@ -1,10 +1,10 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/OperationRecord.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/OperationRecord.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
index 6edc8ce..36c83d0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/OperationRecord.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
@@ -1,12 +1,12 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Role.java
similarity index 97%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Role.java
index a198217..ade6cfe 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Role.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.HostService;
+import com.zy.asrs.wcs.system.service.HostService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/RoleMenu.java
similarity index 95%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/RoleMenu.java
index fafb7d5..ca6f43d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/RoleMenu.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/RoleMenu.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
similarity index 97%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
index 167c016..7e0fe62 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/User.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/User.java
@@ -1,11 +1,11 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.DeptService;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.service.DeptService;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserLogin.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
similarity index 94%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserLogin.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
index 4bc204b..92bd052 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserLogin.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
@@ -1,12 +1,12 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wcs.sys.service.HostService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.zy.asrs.wcs.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserRole.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserRole.java
similarity index 95%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserRole.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserRole.java
index b298634..75ac0a6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/UserRole.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserRole.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.sys.entity;
+package com.zy.asrs.wcs.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/DeptMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DeptMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/DeptMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DeptMapper.java
index d077257..153fb4a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/DeptMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DeptMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.Dept;
+import com.zy.asrs.wcs.system.entity.Dept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/HostMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/HostMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/HostMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/HostMapper.java
index e64fd86..c975807 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/HostMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/HostMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.Host;
+import com.zy.asrs.wcs.system.entity.Host;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/MenuMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/MenuMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/MenuMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/MenuMapper.java
index 8839d22..bebb8c5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/MenuMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/MenuMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.Menu;
+import com.zy.asrs.wcs.system.entity.Menu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/OperationRecordMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/OperationRecordMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/OperationRecordMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/OperationRecordMapper.java
index 3fd88a2..fe3cb9a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/OperationRecordMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/OperationRecordMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.OperationRecord;
+import com.zy.asrs.wcs.system.entity.OperationRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMapper.java
index 2919b46..2913f7d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.Role;
+import com.zy.asrs.wcs.system.entity.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMenuMapper.java
similarity index 79%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMenuMapper.java
index 05f3edc..94af2f7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/RoleMenuMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/RoleMenuMapper.java
@@ -1,9 +1,9 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.RoleMenu;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.RoleMenu;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserLoginMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserLoginMapper.java
similarity index 73%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserLoginMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserLoginMapper.java
index cc15246..33c98cb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserLoginMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserLoginMapper.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
-import com.zy.asrs.wcs.sys.entity.UserLogin;
+import com.zy.asrs.wcs.system.entity.UserLogin;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java
similarity index 85%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java
index 9a252f3..df2573f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserRoleMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserRoleMapper.java
similarity index 74%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserRoleMapper.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserRoleMapper.java
index 4fb6053..2f2aa3f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/mapper/UserRoleMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserRoleMapper.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.sys.mapper;
+package com.zy.asrs.wcs.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.entity.UserRole;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.entity.UserRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DeptService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DeptService.java
new file mode 100644
index 0000000..7a76ea6
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DeptService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.system.entity.Dept;
+
+public interface DeptService extends IService<Dept> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/HostService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/HostService.java
new file mode 100644
index 0000000..5d5857b
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/HostService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.system.entity.Host;
+
+public interface HostService extends IService<Host> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/MenuService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/MenuService.java
new file mode 100644
index 0000000..f905b3d
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/MenuService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.system.entity.Menu;
+
+public interface MenuService extends IService<Menu> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/OperationRecordService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/OperationRecordService.java
similarity index 67%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/OperationRecordService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/OperationRecordService.java
index fe5876c..6ac2e11 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/OperationRecordService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/OperationRecordService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.sys.service;
+package com.zy.asrs.wcs.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.OperationRecord;
+import com.zy.asrs.wcs.system.entity.OperationRecord;
public interface OperationRecordService extends IService<OperationRecord> {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleMenuService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleMenuService.java
similarity index 62%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleMenuService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleMenuService.java
index 2e52705..8126012 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/RoleMenuService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleMenuService.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.sys.service;
+package com.zy.asrs.wcs.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.RoleMenu;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.RoleMenu;
import java.util.List;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleService.java
new file mode 100644
index 0000000..d106b74
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/RoleService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.system.entity.Role;
+
+public interface RoleService extends IService<Role> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserLoginService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
similarity index 76%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserLoginService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
index 4716e92..8e18fd7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserLoginService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserLoginService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.sys.service;
+package com.zy.asrs.wcs.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.UserLogin;
+import com.zy.asrs.wcs.system.entity.UserLogin;
import javax.servlet.http.HttpServletRequest;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserRoleService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserRoleService.java
similarity index 60%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserRoleService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserRoleService.java
index 350e219..296b66d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserRoleService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserRoleService.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.sys.service;
+package com.zy.asrs.wcs.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.entity.UserRole;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.entity.UserRole;
import java.util.List;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java
similarity index 79%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserService.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java
index fe72fd9..7654f3a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/UserService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.sys.service;
+package com.zy.asrs.wcs.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.system.entity.User;
public interface UserService extends IService<User> {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DeptServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DeptServiceImpl.java
new file mode 100644
index 0000000..2818fc7
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DeptServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.service.impl;
+
+import com.zy.asrs.wcs.system.mapper.DeptMapper;
+import com.zy.asrs.wcs.system.entity.Dept;
+import com.zy.asrs.wcs.system.service.DeptService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("deptService")
+public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/HostServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/HostServiceImpl.java
new file mode 100644
index 0000000..c2fc145
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/HostServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.service.impl;
+
+import com.zy.asrs.wcs.system.mapper.HostMapper;
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.service.HostService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("hostService")
+public class HostServiceImpl extends ServiceImpl<HostMapper, Host> implements HostService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/MenuServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/MenuServiceImpl.java
new file mode 100644
index 0000000..9aa46c1
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/MenuServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.service.impl;
+
+import com.zy.asrs.wcs.system.mapper.MenuMapper;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.service.MenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("menuService")
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/OperationRecordServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/OperationRecordServiceImpl.java
similarity index 68%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/OperationRecordServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/OperationRecordServiceImpl.java
index f9a4610..e1ad8f8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/OperationRecordServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/OperationRecordServiceImpl.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.sys.service.impl;
+package com.zy.asrs.wcs.system.service.impl;
-import com.zy.asrs.wcs.sys.mapper.OperationRecordMapper;
-import com.zy.asrs.wcs.sys.entity.OperationRecord;
-import com.zy.asrs.wcs.sys.service.OperationRecordService;
+import com.zy.asrs.wcs.system.mapper.OperationRecordMapper;
+import com.zy.asrs.wcs.system.entity.OperationRecord;
+import com.zy.asrs.wcs.system.service.OperationRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleMenuServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleMenuServiceImpl.java
similarity index 64%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleMenuServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleMenuServiceImpl.java
index 27148f9..8c5f6c9 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/RoleMenuServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleMenuServiceImpl.java
@@ -1,10 +1,10 @@
-package com.zy.asrs.wcs.sys.service.impl;
+package com.zy.asrs.wcs.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wcs.sys.entity.Menu;
-import com.zy.asrs.wcs.sys.entity.RoleMenu;
-import com.zy.asrs.wcs.sys.mapper.RoleMenuMapper;
-import com.zy.asrs.wcs.sys.service.RoleMenuService;
+import com.zy.asrs.wcs.system.entity.Menu;
+import com.zy.asrs.wcs.system.entity.RoleMenu;
+import com.zy.asrs.wcs.system.mapper.RoleMenuMapper;
+import com.zy.asrs.wcs.system.service.RoleMenuService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleServiceImpl.java
new file mode 100644
index 0000000..d70e872
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/RoleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.service.impl;
+
+import com.zy.asrs.wcs.system.mapper.RoleMapper;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.service.RoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("roleService")
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserLoginServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
similarity index 80%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserLoginServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
index 24b1a0a..cff83bb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserLoginServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserLoginServiceImpl.java
@@ -1,8 +1,8 @@
-package com.zy.asrs.wcs.sys.service.impl;
+package com.zy.asrs.wcs.system.service.impl;
-import com.zy.asrs.wcs.sys.mapper.UserLoginMapper;
-import com.zy.asrs.wcs.sys.entity.UserLogin;
-import com.zy.asrs.wcs.sys.service.UserLoginService;
+import com.zy.asrs.wcs.system.mapper.UserLoginMapper;
+import com.zy.asrs.wcs.system.entity.UserLogin;
+import com.zy.asrs.wcs.system.service.UserLoginService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserRoleServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserRoleServiceImpl.java
similarity index 62%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserRoleServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserRoleServiceImpl.java
index 4bfa6e5..52e91d1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserRoleServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserRoleServiceImpl.java
@@ -1,10 +1,10 @@
-package com.zy.asrs.wcs.sys.service.impl;
+package com.zy.asrs.wcs.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wcs.sys.entity.Role;
-import com.zy.asrs.wcs.sys.entity.UserRole;
-import com.zy.asrs.wcs.sys.mapper.UserRoleMapper;
-import com.zy.asrs.wcs.sys.service.UserRoleService;
+import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.entity.UserRole;
+import com.zy.asrs.wcs.system.mapper.UserRoleMapper;
+import com.zy.asrs.wcs.system.service.UserRoleService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
similarity index 84%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
index 81953c4..ed6d298 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java
@@ -1,12 +1,12 @@
-package com.zy.asrs.wcs.sys.service.impl;
+package com.zy.asrs.wcs.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.mapper.UserMapper;
-import com.zy.asrs.wcs.sys.service.RoleMenuService;
-import com.zy.asrs.wcs.sys.service.UserRoleService;
-import com.zy.asrs.wcs.sys.service.UserService;
+import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.mapper.UserMapper;
+import com.zy.asrs.wcs.system.service.RoleMenuService;
+import com.zy.asrs.wcs.system.service.UserRoleService;
+import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index 7ace39c..ce435ad 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -23,7 +23,7 @@
// generator.password="Zoneyung@zy56$";
generator.table="sys_user_role";
- generator.packagePath="com.zy.asrs.wcs.sys";
+ generator.packagePath="com.zy.asrs.wcs.system";
generator.controller = false;
generator.html = false;
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/DeptMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/DeptMapper.xml
deleted file mode 100644
index 6ea2f3b..0000000
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/DeptMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.DeptMapper">
-
-</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/HostMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/HostMapper.xml
deleted file mode 100644
index 93847ab..0000000
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/HostMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.HostMapper">
-
-</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/MenuMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/MenuMapper.xml
deleted file mode 100644
index 94458c1..0000000
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/MenuMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.MenuMapper">
-
-</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/UserLoginMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/sys/UserLoginMapper.xml
deleted file mode 100644
index ee05c9f..0000000
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/UserLoginMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.UserLoginMapper">
-
-</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/DeptMapper.xml
similarity index 71%
rename from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/system/DeptMapper.xml
index 24febe9..439a45b 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/DeptMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.DeptMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml
similarity index 71%
copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml
index 24febe9..14a7482 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/HostMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.HostMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml
similarity index 71%
copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml
index 24febe9..e932533 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/MenuMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.MenuMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/OperationRecordMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/OperationRecordMapper.xml
similarity index 68%
rename from zy-asrs-wcs/src/main/resources/mapper/sys/OperationRecordMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/system/OperationRecordMapper.xml
index 42d8bea..0059b7e 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/OperationRecordMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/OperationRecordMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.OperationRecordMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.OperationRecordMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml
similarity index 71%
copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml
index 24febe9..42a92e8 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/RoleMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.RoleMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/RoleMenuMapper.xml
similarity index 89%
rename from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/system/RoleMenuMapper.xml
index 3d00005..f423e89 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMenuMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/RoleMenuMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMenuMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.RoleMenuMapper">
- <select id="listMenuByUserId" resultType="com.zy.asrs.wcs.sys.entity.Menu">
+ <select id="listMenuByUserId" resultType="com.zy.asrs.wcs.system.entity.Menu">
select * from sys_menu
where 1=1
<if test="type != null">
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml
similarity index 70%
copy from zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml
index 24febe9..1362ee4 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/RoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/UserLoginMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.RoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.UserLoginMapper">
</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/UserMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
similarity index 84%
rename from zy-asrs-wcs/src/main/resources/mapper/sys/UserMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
index 0213081..2648c30 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/UserMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.UserMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.UserMapper">
<!-- 鏍规嵁璐﹀彿鏌ヨ -->
- <select id="selectByUsername" resultType="com.zy.asrs.wcs.sys.entity.User">
+ <select id="selectByUsername" resultType="com.zy.asrs.wcs.system.entity.User">
select * from sys_user
where 1=1
and deleted = 0
diff --git a/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/UserRoleMapper.xml
similarity index 72%
rename from zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml
rename to zy-asrs-wcs/src/main/resources/mapper/system/UserRoleMapper.xml
index 69375fc..157624d 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/sys/UserRoleMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/UserRoleMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wcs.sys.mapper.UserRoleMapper">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.UserRoleMapper">
- <select id="selectByUserId" resultType="com.zy.asrs.wcs.sys.entity.Role">
+ <select id="selectByUserId" resultType="com.zy.asrs.wcs.system.entity.Role">
select *
from sys_role
where 1=1
--
Gitblit v1.9.1