Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -38,7 +38,7 @@
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {

   @Override
   public IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceDTO fwDevice) {
   public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
      return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
   }