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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

 kidgrow-config/src/main/resources/bootstrap.properties

@@ -7,4 +7,9 @@
management.endpoint.health.show-details=always

##### \u5141\u8BB8bean\u8986\u76D6
spring.main.allow-bean-definition-overriding=true
spring.main.allow-bean-definition-overriding=true

#####\u5B57\u7B26\u7C7B\u578B#####
spring.http.encoding.charset=UTF-8
spring.http.encoding.enabled=true
spring.http.encoding.force=true