From b692ac435d17332e262b23ad231577bfb5238f83 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 14:09:02 +0800
Subject: [PATCH] 后端

---
 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