Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

 user-server/src/main/java/com/yuanchu/limslaboratory/mapper/MenuMapper.java

@@ -5,6 +5,7 @@
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

/**
 * @Author 张宾
@@ -15,5 +16,6 @@

    List<Menu> getMenuList();

    List<Map<String, Object>> getMenuNameAndId();

}