Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 fbb48357d807b6e776821decacda68af6b2cc6aa

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java

@@ -26,6 +26,7 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * 设备表 视图实体类
@@ -106,6 +107,9 @@
   @ApiModelProperty("运行状态（0:在线/1:离线/2:故障/3:报废）")
   private Integer status;

   @ApiModelProperty("创建时间")
   private Date createTime;

   /**
    * 电量百分比 0-100
    */