Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-03-26 bf5c42b55da25fbcbb8f92bde539a8e27d800b40

 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() ;
}