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

云

2 天以前 a77decc3df26449414639082293e2ee6722e643c

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

@@ -7,9 +7,10 @@
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.pojo.StockInventory;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;

import jakarta.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * <p>
@@ -44,4 +45,6 @@
    Boolean frozenStock(StockInventoryDto stockInventoryDto);

    Boolean thawStock(StockInventoryDto stockInventoryDto);

    List<StockInventory> getByModelId(Long modelId);
}