Merge remote-tracking branch 'origin/master'

wu

2024-08-02 928fa3682fcd0bcb59e3ca3da8770ecbb06cf315

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

@@ -2,6 +2,7 @@


import com.mes.shelfrack.entity.ShelfRack;

import com.baomidou.mybatisplus.extension.service.IService;

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



import java.util.List;

import java.util.Map;

@@ -14,6 +15,6 @@


    List<ShelfRack> findList(ShelfRack params);



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

    List<RawUsageAndShelfRack> selectshelf_rack();



}