Merge remote-tracking branch 'origin/master'

# Conflicts: # system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SmsYunPianPlatform.java
2019-05-18 10:35:09 +08:00
parent 551f6aa673 6038560836
commit 1e3ea29dbb
127 changed files with 816 additions and 1191 deletions
--- a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/package-info.java
+++ b/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/package-info.java
@@ -1,5 +0,0 @@
-/**
- * @author Sin
- * @time 2019/5/16 10:52 AM
- */
-package cn.iocoder.mall.admin;