Merge remote-tracking branch 'origin/master'

rain

2026-01-12 642c5a536be148e0b907309e30f4ad3530c5ae54

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java

@@ -98,7 +98,7 @@
   @ApiOperation(value = "新增或修改", notes = "传入fwDeviceTrack")
   public R submit(@Valid @RequestBody FwDeviceTrackDTO fwDeviceTrack) {

      if (null != fwDeviceTrack.getDeviceId()) {
      if (null == fwDeviceTrack.getDeviceId()) {
         return R.fail("设备ID不能为空");
      }