From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java
index d879a25..8e8286c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java
@@ -21,5 +21,5 @@
 
     List<WarehouseConfigItem> getList(Map<String, Object> params);
 
-    List<DictIstance> itemList(Long projectId);
+    List<WarehouseConfigItem> itemList(Long projectId);
 }

--
Gitblit v1.9.1