From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
index 3570a5a..87bbbfd 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
@@ -1,8 +1,13 @@
 package com.mes.shelfrack.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.shelfrack.entity.ShelfRack;
-import org.apache.ibatis.annotations.Mapper;
+import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  *  
  *
@@ -10,7 +15,9 @@
  * @since 2024-07-09 14:51:27
  *
  */
-@Mapper
-public interface ShelfRackMapper extends BaseMapper<ShelfRack> {
 
+public interface ShelfRackMapper extends MPJBaseMapper<ShelfRack> {
+
+
+    List<RawUsageAndShelfRack> selectshelf_rack();
 }
\ No newline at end of file

--
Gitblit v1.8.0