Merge remote-tracking branch 'origin/main'

xieb

2023-09-26 faedd5d2f0ee850464f0507da93c37459bd5e3bb

 src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java

@@ -279,10 +279,13 @@
    public List<DeviceDTO> getDevicesByParams(DeviceQueryParam param) {
        return mapper.selectList(
                new LambdaQueryWrapper<DeviceEntity>()
                        //设备编码
                        .eq(StringUtils.hasText(param.getDeviceSn()),
                                DeviceEntity::getDeviceSn, param.getDeviceSn())
                        //设备类型
                        .eq(param.getDeviceType() != null,
                                DeviceEntity::getDeviceType, param.getDeviceType())
                        //负载类型
                        .eq(param.getSubType() != null,
                                DeviceEntity::getSubType, param.getSubType())
                        .eq(StringUtils.hasText(param.getChildSn()),
@@ -1194,4 +1197,4 @@
        }
        return deviceBasic.getPayloads();
    }
}
}