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

wang

2024-03-26 ea073afc6b4bc758990ac60f5e33254d1143272c

 CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java

@@ -2,11 +2,16 @@

import com.mes.entity.userInfo.SysMenuItem;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

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