From 00957f0c836b80d9052a6ccf673d3b454b646081 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 18:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
index 4213712..69a61ff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java
@@ -8,6 +8,7 @@
 import com.ruoyi.system.dto.InventoryGoodsDto;
 import com.ruoyi.system.model.TErpGoods;
 import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
+import com.ruoyi.system.query.TErpGoodsAdminQuery;
 import com.ruoyi.system.query.TErpGoodsInventoryQuery;
 import com.ruoyi.system.query.TErpGoodsQuery;
 import com.ruoyi.system.vo.OutboundGoodsDetailVo;
@@ -75,4 +76,7 @@
     PageInfo<TErpGoodsVO> pageList1(TErpGoodsQuery query, SysUser user);
 
 
+    PageInfo<TErpGoodsVO> pageAdminList(TErpGoodsAdminQuery query);
+
+
 }

--
Gitblit v1.7.1