Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-07-03 18:47:10 +08:00
68 changed files with 5456 additions and 10 deletions

View File

@@ -26,6 +26,9 @@ import java.io.IOException;
{{/useSpringCloudClient}}
import java.util.List;
{{#useOptional}}
import java.util.Optional;
{{/useOptional}}
{{#async}}
import java.util.concurrent.{{^jdk8}}Callable{{/jdk8}}{{#jdk8}}CompletableFuture{{/jdk8}};
{{/async}}