Merge remote-tracking branch 'origin/develop' into develop

project-user/src/main/java/com/dituhui/pea/user/Application.java → project-user/src/main/java/com/dituhui/pea/user/UserApplication.java

@@ -12,10 +12,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableFeignClients(basePackages = {"com.dituhui.pea.order"})
 @EnableFeignClients(basePackages = {"com.dituhui.pea.order"})
 @EnableJpaAuditing
 @EnableJpaAuditing
 @EnableTransactionManagement
 @EnableTransactionManagement
-public class Application {
+public class UserApplication {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(UserApplication.class, args);
     }
     }
 
 
 }
 }