# Conflicts: # ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
# Conflicts: # README.md