Merge branch 'master' into dev

324c8da3 · linlinjava · GitHub · 693cf5cd · 4c46da9b · 324c8da3
Unverified Commit 324c8da3 authored Dec 29, 2019 by linlinjava Committed by GitHub Dec 29, 2019
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java
--- a/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java
+++ b/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java
--- a/litemall-admin/.babelrc
+++ b/litemall-admin/.babelrc
--- a/litemall-admin/.editorconfig
+++ b/litemall-admin/.editorconfig