Merge remote-tracking branch 'origin/master'

rain

2026-01-14 46b35a8bbb4767b2a28b03a88f705d18c9dbf426

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

@@ -47,6 +47,11 @@
   private final IFwDeviceService fwDeviceService;

   @Override
   public FwDeviceScrapVO getFwDeviceScrapById(Long id) {
      return baseMapper.getFwDeviceScrapById(id);
   }

   @Override
   @Transactional
   public boolean saveFwDeviceScrap(FwDeviceScrapDTO dto) {
      boolean isSuccess = super.save(FwDeviceScrapWrapper.build().entityDTO(dto));