Merge branch 'dev' into base-modify

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/UserBeHaviorApplication.java

@@ -13,9 +13,12 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @data 2019/8/12 10:04
  */
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = "com.xxfc.platform.*.feign")
+@EnableFeignClients(basePackages = {"com.xxfc.platform.*.feign","com.github.wxiaoqi.security.*.feign"})
 @MapperScan(basePackages = "com.xxfc.platform.user.behavior.mapper")
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages ={
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.security.admin.support"
+})
 public class UserBeHaviorApplication {
     public static void main(String[] args) {
         SpringApplication.run(UserBeHaviorApplication.class,args);