Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-02 ec4752a2780a1336bbdca510e6888423a794c16d

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java

@@ -7,6 +7,7 @@
import com.github.yulichang.toolkit.JoinWrappers;

import com.mes.common.config.Const;

import com.mes.rawusage.entity.RawUsage;

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

import com.mes.shelfrack.mapper.ShelfRackMapper;

import com.mes.shelfrack.entity.ShelfRack;

import com.mes.shelfrack.service.ShelfRackService;

@@ -51,7 +52,7 @@




    @Override

    public  List<Map<String, Object>> selectshelf_rack() {

    public  List<RawUsageAndShelfRack> selectshelf_rack() {

        return baseMapper.selectshelf_rack();

    }