Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-18 9f4c4e77bd7936645d174f21a6abf8951b533e8d

 dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java

@@ -12,9 +12,7 @@
 */
@Mapper
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
    List<AirEquipmentBo> listAirEquipment();

    List<AirEquipmentBo> listAirEquipmentByKeyword(String keyword);
    List<AirEquipmentBo> listAirEquipmentByIds(String keyword, Long clientId);
}