Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -124,7 +124,7 @@ class ATemplateController extends BaseController
      * @time   :2023/7/10 15:30
      * @time   :2023/7/10 15:30
      */
      */
     public function getHeadFooter(ATemplateLogic $aTemplateLogic){
     public function getHeadFooter(ATemplateLogic $aTemplateLogic){
-        $info = $aTemplateLogic->getHeadFooterInfo();
+        $info = $aTemplateLogic->getHeadFooterList();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 }
 }

@@ -151,9 +151,9 @@ class ATemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/10 15:33
      * @time   :2023/7/10 15:33
      */
      */
-    public function getHeadFooterInfo(){
+    public function getHeadFooterList(){
         $serviceSettingModel = new ServiceSettingModel();
         $serviceSettingModel = new ServiceSettingModel();
-        $info = $serviceSettingModel->list(['type'=>2],'created_at',['key','values','created_at']);
-        return $this->success($info);
+        $list = $serviceSettingModel->list(['type'=>2]);
+        return $this->success($list);
     }
     }
 }
 }