Merge remote-tracking branch 'origin/master'

zss

2024-07-23 c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2

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

@@ -27,7 +27,7 @@

    IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId,String sonLaboratory);

    IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
    IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId,String sonLaboratory);

    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);