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/rest/DictController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java