Merge remote-tracking branch 'origin/master'

zss

2025-03-25 66990e9be43f71b89aa42065d696b682d803afa6

 inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java

@@ -3,6 +3,7 @@
import com.yuanchu.mom.dto.WarehouseCellAndSampleDto;
import com.yuanchu.mom.pojo.WarehouseCell;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -14,7 +15,7 @@
*/
public interface WarehouseCellMapper extends BaseMapper<WarehouseCell> {

    List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId);
    List<WarehouseCellAndSampleDto> getWarehouse(@Param("shelfId") Integer shelfId, @Param("sampleCode") String sampleCode);

}