Merge branch '2.3dev'

fd9fb2a6 · dqjdda · 7895e547 · 1839ef8d · fd9fb2a6 · fd9fb2a6
Commit fd9fb2a6 authored Nov 01, 2019 by dqjdda
--- a/eladmin-system/src/main/resources/template/generator/front/api.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/api.ftl
--- a/eladmin-system/src/main/resources/template/generator/front/eForm.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/eForm.ftl
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
--- a/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java
+++ b/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java
--- a/eladmin-tools/pom.xml
+++ b/eladmin-tools/pom.xml
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java
--- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java
--- a/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java