Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-06 e1c8bed1b24df8a6c80ffa582bb966acacc8a5d7

 Api/src/main/java/com/java110/api/ApiApplicationStart.java

@@ -40,10 +40,8 @@
 * @date 2016年8月6日
 * @tag
 */
@SpringBootApplication(scanBasePackages = {"com.java110.service.aop",
@SpringBootApplication(scanBasePackages = {
        "com.java110.service.configuration",
        "com.java110.service.controller",
        "com.java110.service.filter",
        "com.java110.service.init",
        "com.java110.api",
        "com.java110.core",