Merge remote-tracking branch 'origin/master'

value

2024-06-19 e029c61aa09bf1ae1af7b07fa4e78d87442c44f1

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

@@ -36,9 +36,9 @@
    IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);

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

    Long getCount(String inspectionItems, String orderNumber);
    Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);

    String getEnumLabelByValue(String value);