Merge remote-tracking branch 'origin/master'

rain

2026-01-22 2636fff845e9460ca35abb20e7a22d34fb4f39a3

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java

@@ -34,7 +34,7 @@
   private static final long serialVersionUID = 1L;

   @ApiModelProperty("主键id")
   private Integer id;
   private Long id;

   @ApiModelProperty(value = "设备型号")
   private String deviceName;