Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-04-07 1982a4f0aea16e109d3f30ddc20c2458ea0f6f31

 src/main/java/com/dji/sample/wayline/service/IWaylineRedisService.java

@@ -79,6 +79,7 @@

    /**
     * Save the conditional wayline job by the dock to redis.
     * 将条件航线任务保存到redis中
     * @param waylineJob
     */
    void setConditionalWaylineJob(WaylineJobDTO waylineJob);
@@ -99,6 +100,7 @@

    /**
     * Add the wayline job that needs to be issued.
     * 添加需要发布的航路线作业
     * @param waylineJob
     * @return
     */