# Conflicts: # yudao-server/src/main/resources/application-local.yaml
Merge pull request !765 from 芋道源码/feature/sub-table
