From fc51b3c1c8a6763c151d2c3682cd02a078d81c27 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 20 六月 2025 09:07:47 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleMenuService.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleMenuService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleMenuService.java
index e5b8336..2b487f1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleMenuService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/RoleMenuService.java
@@ -1,17 +1,17 @@
-package com.zy.asrs.wms.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.wms.system.entity.Menu;
-import com.zy.asrs.wms.system.entity.RoleMenu;
-
-import java.util.List;
-
-public interface RoleMenuService extends IService<RoleMenu> {
-
-    List<Menu> listMenuByUserId(Long userId, Integer menuType);
-
-    List<Menu> listMenuByUserId(Long userId, Integer menuType, Long hostId);
-
-    List<Long> listStrictlyMenuByRoleId(Long roleId);
-
-}
+package com.zy.asrs.wms.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.system.entity.Menu;
+import com.zy.asrs.wms.system.entity.RoleMenu;
+
+import java.util.List;
+
+public interface RoleMenuService extends IService<RoleMenu> {
+
+    List<Menu> listMenuByUserId(Long userId, Integer menuType);
+
+    List<Menu> listMenuByUserId(Long userId, Integer menuType, Long hostId);
+
+    List<Long> listStrictlyMenuByRoleId(Long roleId);
+
+}

--
Gitblit v1.9.1