Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # pom.xml # yudao-dependencies/pom.xml
This commit is contained in:
commit
7cc51f3945
# Conflicts: # pom.xml # yudao-dependencies/pom.xml