Merge remote-tracking branch 'origin/master'

123456

2024-07-17 23adbd6fd679e293c4c8118713b9e1e8b0a463bb

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

@@ -35,6 +35,8 @@

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

    List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);

    List<Map<String, String>> selectDeviceList(Set<String> names);
    List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);