Merge branch '2.3dev'

fd9fb2a6 · dqjdda · 7895e547 · 1839ef8d · fd9fb2a6 · fd9fb2a6
Commit fd9fb2a6 authored Nov 01, 2019 by dqjdda
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java