From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 22 八月 2023 13:56:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml b/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml index 427d44c..c64e216 100644 --- a/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml +++ b/laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml @@ -6,5 +6,6 @@ SELECT e.`id`, e.`equipment_point` equipmentPoint, e.`equipment_point_name` equipmentPointName, e.`unit`,u.`name`, DATE_FORMAT(e.`update_time`, '%Y-%m-%d') updateTime, e.`descriptiveness` FROM equipment_point e, `user` u WHERE e.`user_id` = u.`id` + AND e.`instrument_id` = #{InstrumentId} </select> </mapper> -- Gitblit v1.9.3