Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-19 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3

 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);