Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

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

@@ -23,6 +23,8 @@
import org.sxkj.system.cache.SysCache;
import java.io.Serializable;
import java.math.BigDecimal;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

/**
 * 设备表 视图实体类
@@ -36,6 +38,7 @@
   private static final long serialVersionUID = 1L;

   @ApiModelProperty(value = "主键")
   @JsonSerialize(using = ToStringSerializer.class)
   private   Long id;

   /**