Merge remote-tracking branch 'origin/master'

zss

2023-08-23 35bf80accf4117e3de030fdd7e3962f16a5fcfd9

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