Merge remote-tracking branch 'origin/master'

Crunchy

2024-06-04 ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -26,6 +26,8 @@

    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);

    List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);

    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);

    String getSampleEn(String sample);