Merge remote-tracking branch 'origin/main'

# Conflicts: # ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
2025-12-05 14:40:59 +08:00
parent 26023bd55b 9c1c77089f
commit 6bb5698c29
20 changed files with 1794 additions and 5 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
@@ -24,4 +24,6 @@ public interface IToErpService {
    AjaxResult receiveSupplier();

    String login();
+
+    AjaxResult receiveOutStockList();
 }