From 3d048a0fffd215dac674d4406fb48c42361af8d0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 01 六月 2026 13:59:37 +0800
Subject: [PATCH] feat(shipping): 1.发货的时候需要填出库批号，选入库批号 2.可以按批号，批量入库 3.销售退货将发货单号改成出库批号

---
 src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
index 8f9ced9..3f770f8 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
@@ -9,7 +9,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**

--
Gitblit v1.9.3