From 79b5ac3e0c0503462af7a71eec5613051c29857c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 10 四月 2024 08:27:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
index 92d81e4..4b42b5f 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
@@ -8,10 +8,9 @@
@Mapper
public interface SysMenuItemMapper {
-<<<<<<< HEAD
+
@Select("select * from `sys_menu_item` as a where a.state=1 order by a.menuId,a.listSort;")
-=======
- @Select("select * from sys_menu_item")
->>>>>>> e9b0059e5ee9551f7b9b81c9358ce3d42886ae9a
+
+
List<SysMenuItem> findAll() ;
}
--
Gitblit v1.8.0