From ea073afc6b4bc758990ac60f5e33254d1143272c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 13:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 d47fc8d..92d81e4 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
@@ -8,6 +8,10 @@
@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