Merge branch 'v0.0.1-day-subject' into 'dev'

bug See merge request !3

Merge branch 'v0.0.1-day-subject' into 'dev'
bug See merge request !3
f06aa690 · 吴泽佳 · 4b0ce8c6 · ec7fd3e3 · f06aa690
Commit f06aa690 authored Aug 10, 2021 by 吴泽佳
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

FeoJobApplication.java src/main/java/com/tanpu/feo/feojob/FeoJobApplication.java +1 -1

No files found.
--- a/src/main/java/com/tanpu/feo/feojob/FeoJobApplication.java
+++ b/src/main/java/com/tanpu/feo/feojob/FeoJobApplication.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;

 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableHystrix
+//@EnableHystrix
 @EnableFeignClients
 @EnableTransactionManagement
 //@MapperScan(basePackages = "com.tanpu.feo.**.mapper")