Merge branch '20250814_randomweb_fr'

app/JsonRpc/PublicRpcService.php

@@ -3442,7 +3442,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                             0
                         ];
                         $canvas_adinfo[$key] = array_combine(array_slice($ad, 0, count($values)), $values);
-                    $canvas_data[$key]['ad'] = $canvas_adinfo[$key];
+                        $canvas_data[$key]['content']['ad'] = $canvas_adinfo[$key];
                        // 确保 $ad 和 $canvas_adinfo[$key] 元素数量一致，直接组合
                     //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
                        $Component['componentData'] = [];
@@ -3464,7 +3464,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                             0
                         ];
                         $canvas_adinfo[$key] = array_combine(array_slice($ad, 0, count($values)), $values);
-                    $canvas_data[$key]['ad'] = $canvas_adinfo[$key];
+                    $canvas_data[$key]['content']['ad'] = $canvas_adinfo[$key];
                     //    $canvas_data[$key]['ad'] = array_combine($ad, $canvas_adinfo[$key]);
 
                         $Component['componentData'] = [];