Merge branch '2.3dev'

fd9fb2a6 · dqjdda · 7895e547 · 1839ef8d · fd9fb2a6 · fd9fb2a6
Commit fd9fb2a6 authored Nov 01, 2019 by dqjdda
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java