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

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

 src/main/java/com/ruoyi/technology/service/TechnologyBomService.java

@@ -7,9 +7,9 @@
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.pojo.TechnologyBom;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;

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

public interface TechnologyBomService extends IService<TechnologyBom> {
@@ -22,7 +22,7 @@

    R update(TechnologyBom technologyBom);

    boolean batchDelete(List<Integer> ids);
    boolean batchDelete(List<Long> ids);

    R uploadBom(MultipartFile file);