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/mapper/DeptMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java
--- a/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin-system/src/main/resources/config/application-dev.yml
--- a/eladmin-system/src/main/resources/config/application-prod.yml
+++ b/eladmin-system/src/main/resources/config/application-prod.yml
--- a/eladmin-system/src/main/resources/config/application.yml
+++ b/eladmin-system/src/main/resources/config/application.yml
--- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
--- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl
--- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl
--- a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl
--- a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl
--- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl