Merge remote-tracking branch 'origin/master'

zss

2023-08-22 da30df12fc02f28a4b016c8c35a3b57e5c29fe35

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

@@ -21,7 +21,7 @@

    Integer addEquipmentPointInformation(EquipmentPoint equipmentPoint);

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

    Integer deleteEquipmentPointInformation(Integer equipmentPointId);