Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 4b55cf8d21443e366f83acf20c4333abef8f54ae

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java

@@ -19,7 +19,7 @@

    Integer addEquipmentPointInformation(MetricalInformation metricalInformation, MultipartFile file);

    List<Map<String, Object>> getListEquipmentPointInformation();
    List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId);

    Integer deleteMetricalInformation(Integer metricalInformationId);