Merge remote-tracking branch 'origin/master'

CeDo

2021-04-02 ec192c9a7385ce426a4340506b90acd78d9700aa

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/ServiceUserApplication.java

@@ -2,8 +2,15 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.context.annotation.ComponentScan;

@SpringBootApplication
@SpringCloudApplication
@EnableEurekaClient
@EnableCircuitBreaker
@ComponentScan({"com.panzhihua.service_user","com.panzhihua.common"})
public class ServiceUserApplication {

    public static void main(String[] args) {