Merge remote-tracking branch 'origin/master'

zss

2023-08-26 6984757bfc75b4a25014de1eb71c2aa75ebdb86f

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java

@@ -19,5 +19,5 @@
 */
public interface EquipmentPointMapper extends BaseMapper<EquipmentPoint> {

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