# Conflicts: # ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
# Conflicts: # sql/ry_20210731.sql