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

zss

7 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

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

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

    R uploadBom(MultipartFile file);

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

    R copy(TechnologyBom technologyBom);
}