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

jiangping

2024-10-17 14b70bacd63f6b136612cf70b160777142e2a996

 server/service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java

@@ -40,7 +40,7 @@
     * @author Eva.Caesar Liu
     * @date 2023/03/21 14:49
     */
    List<SystemMenuNodeVO> findTree(Integer userId);
    List<SystemMenuNodeVO> findTree(Integer userId,Integer type);

    /**
     * 查询菜单列表树