mirror of
https://gitee.com/beifeng_java/gulimall.git
synced 2025-12-26 07:16:29 +08:00
bugfix
This commit is contained in:
parent
ef5bb8cf83
commit
1fded5d493
@ -69,7 +69,6 @@ gulimall:
|
|||||||
corePoolSize: 10
|
corePoolSize: 10
|
||||||
maxPoolSize: 20
|
maxPoolSize: 20
|
||||||
keepAliveTime: 300
|
keepAliveTime: 300
|
||||||
<<<<<<< HEAD
|
|
||||||
management:
|
management:
|
||||||
endpoints:
|
endpoints:
|
||||||
web:
|
web:
|
||||||
@ -78,5 +77,3 @@ management:
|
|||||||
feign:
|
feign:
|
||||||
sentinel:
|
sentinel:
|
||||||
enabled: true
|
enabled: true
|
||||||
=======
|
|
||||||
>>>>>>> 9e4857d66f652e179bc55f579092d12e93ed463a
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user