合并分支 'master-server' 到 'master'

gx



查看合并请求 !908

@@ -106,7 +106,7 @@ class TranslateController extends BaseController
                     }
                 }
             }
-            $resData['data'] = $translate_data;
+            $resData['data'] = $translate_data ?? [];
             $res_data[] = $resData;
         }
         $keyList = $keyModel->list(['id'=>['not in',$result_id_data]],'id',['id','proof_key','url','page']);