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

zhangyong

2024-09-06 c72f5d2a4c01a97d39695b3591a4c2f1e4fa67df

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.github.yulichang.base.MPJBaseMapper;

import com.mes.shelfrack.entity.ShelfRack;

import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;



import java.util.List;

import java.util.Map;

@@ -18,5 +19,5 @@
public interface ShelfRackMapper extends MPJBaseMapper<ShelfRack> {





    List<Map<String, Object>> selectshelf_rack();

    List<RawUsageAndShelfRack> selectshelf_rack();

}