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

liyong

9 天以前 473d21a70284f793e8042eb618e2b1ffceb11a66

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

@@ -26,5 +26,7 @@

    R uploadBom(MultipartFile file);

    void exportBom(HttpServletResponse response, Integer bomId);
    void exportBom(HttpServletResponse response, Long bomId);

    R copy(TechnologyBom technologyBom);
}