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

zss

2026-04-30 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 src/main/java/com/ruoyi/stock/service/StockInventoryService.java

@@ -9,7 +9,7 @@
import com.ruoyi.stock.pojo.StockInventory;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;

/**
 * <p>
@@ -29,6 +29,10 @@

    Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);

    Boolean addStockInRecordOnly(StockInventoryDto stockInventoryDto);

    Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto);

    R importStockInventory(MultipartFile file);

    void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto);