Merge branch 'dev'

# Conflicts:
#	msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml

msgpush-module-system/msgpush-module-system-server/src/main/java/com/njcn/msgpush/module/system/SystemServerApplication.java

@@ -2,6 +2,7 @@ package com.njcn.msgpush.module.system;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 项目的启动类