# Conflicts: # yudao-server/src/main/resources/application-local.yaml
Merge pull request !1071 from heyho/master-jdk17
