Merge remote-tracking branch 'origin/master'

linwei

2026-01-23 d85c814b146f5186d4d651e3e8fbb79dc1050fd2

Merge remote-tracking branch 'origin/master'

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml

@@ -8,6 +8,7 @@
        <result column="device_id" property="deviceId"/>
        <result column="area_divide_id" property="areaDivideId"/>
        <result column="defense_scene_id" property="defenseSceneId"/>
        <result column="defense_scene_name" property="defenseSceneName"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="dispatch_user" property="dispatchUser"/>
@@ -39,6 +40,7 @@
        ts.device_id,
        ts.area_divide_id,
        ts.defense_scene_id,
        ds.scene_name as defense_scene_name,
        ts.longitude,
        ts.latitude,
        ts.dispatch_user,

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java

@@ -52,6 +52,11 @@
    @ApiModelProperty(value = "关联场景ID")
    private Long defenseSceneId;
    /**
     * 场景名称
     */
    @ApiModelProperty(value = "场景名称")
    private String defenseSceneName;
    /**
     * 调度经度
     */
    @ApiModelProperty(value = "调度经度")