From 31e23deb9ae71263fb59fcd82c26b22c9cdfc3d4 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 六月 2025 15:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java b/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
index 9b4e444..392ef27 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
@@ -5,6 +5,9 @@
import com.ruoyi.business.dto.OfficialInventoryDto;
import com.ruoyi.business.entity.OfficialInventory;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.business.vo.OfficialInventoryVo;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +20,12 @@
public interface OfficialInventoryService extends IService<OfficialInventory> {
IPage<OfficialInventoryDto> selectOfficialInventoryList(Page page, OfficialInventoryDto officialInventoryDto);
+
+ int mergeAll(OfficialInventoryDto officialInventoryDto);
+
+ int editOfficial(OfficialInventoryDto officialInventoryDto);
+
+ List<OfficialInventoryVo> selectOfficialList(OfficialInventoryVo officialInventoryVo);
+
+ List<OfficialInventory> selectOfficialAll();
}
--
Gitblit v1.9.3