分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java

@@ -33,7 +33,8 @@

    Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);

    Map<String, Object> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);
    List<SampleProductDto2> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);

    List<Map<String, Object>> viewDetails(Map<String,Object> map);

    void exportChecked(Map<String,Object> data, HttpServletResponse response);