Merge remote-tracking branch 'origin/master'

linwei

2026-02-26 0a79e4295745bc59c0f8b8624218df7a226d14b9

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdManageDeviceServiceImpl.java

@@ -324,6 +324,7 @@
      entity.setInsureExpiredTime(parseInsuranceDate(item.getInsuranceInfo()));
      entity.setAreaCode(extractAreaCode(item.getRegionCode()));
      entity.setIsWithDock(item.getIsWithDock());
      entity.setCreateDept(item.getDeptId());
      entity.setDevicePayload(
         Optional.ofNullable(item.getLoadList())
            .orElse(Collections.emptyList())
@@ -362,6 +363,7 @@
      entity.setInsureExpiredTime(parseInsuranceDate(item.getInsuranceInfo()));
      entity.setAreaCode(extractAreaCode(item.getRegionCode()));
      entity.setHeight(item.getHeight());
      entity.setCreateDept(item.getDeptId());
      return entity;
   }