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

zhaowenyu

2025-12-13 83c58f574b2b9006ac28d0eca1e64243cc81948f

 ard-route/src/main/java/com/ard/route/util/InitializationUtils.java

@@ -98,11 +98,13 @@
     */
    private void buildZoom(UavRouteReq uavRouteReq){
        for (RoutePointReq routePointReq : uavRouteReq.getRoutePointList()) {
            for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
                for (PointActionReq action : actionGroupReq.getActions()) {
                    if (action.getZoom() != null){
                        action.setZoom(multiple_23(action.getZoom()));
                        //action.setZoom(multiple_6(action.getZoom()));
            if (!routePointReq.getActionGroupList().isEmpty()){
                for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
                    for (PointActionReq action : actionGroupReq.getActions()) {
                        if (action.getZoom() != null){
                            action.setZoom(multiple_23(action.getZoom()));
                            //action.setZoom(multiple_6(action.getZoom()));
                        }
                    }
                }
            }