Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-19 dd01f5db07017762c900c88b01752d442569a502

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

@@ -31,7 +31,7 @@

    String getLaboratoryCode(String name);

    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);
    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew,Integer id);

    IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);