Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
This commit is contained in:
wangjiahao
2021-06-23 17:40:41 +08:00
9 changed files with 51 additions and 46 deletions

View File

@@ -11,5 +11,5 @@ public interface ExtPluginSysMenuMapper {
void savePluginMenu(@Param("menuList") List<PluginSysMenu> menuList);
void deletePluginMenu();
int deletePluginMenu();
}