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/controller/OfficialInventoryController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
index 196e7ad..4dca675 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
+import com.ruoyi.business.entity.OfficialInventory;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
@@ -39,12 +40,20 @@
/**
* 姝ｅ紡搴撶叅绉嶉儴鍒嗕俊鎭痩ist
*/
- @GetMapping("/OfficialList")
+ @GetMapping("/officialList")
public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
}
/**
+ * 姝ｅ紡搴撶叅绉嶇敓浜у姞宸ラ�夋嫨list
+ */
+ @GetMapping("/officialAll")
+ public R<List<OfficialInventory>> officialAll() {
+ return R.ok(officialInventoryService.selectOfficialAll());
+ }
+
+ /**
* 姝ｅ紡搴撲慨鏀�
*/
@PostMapping("/editOfficial")
--
Gitblit v1.9.3