Merge remote-tracking branch 'origin/develop' into develop

2026-02-26 17:10:27 +08:00
parent 9edf8936ba 753bd8bb4b
commit 87c7981ad9
4 changed files with 43 additions and 23 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
@@ -73,6 +73,16 @@ public class CommonAppController {
        return R.ok(commonService.getInventoryCabinetList());
    }

+    /**
+     * 耗材库列表
+     *
+     * @return 耗材库列表
+     */
+    @GetMapping(value = "/warehouse-list")
+    public R<?> getWarehouseList() {
+        return R.ok(commonService.getWarehouseList());
+    }
+
    /**
     * 药房药库列表
     *