Merge remote-tracking branch 'origin/master' into akun

@@ -67,7 +67,7 @@ class CNoticeController extends BaseController
         }
         }
         $lang_num = count($this->param['language']);
         $lang_num = count($this->param['language']);
         $keyword_num = (new Keyword())->counts(['route'=>['!=',null]]);
         $keyword_num = (new Keyword())->counts(['route'=>['!=',null]]);
-        $data_num = $this->productNum() + $this->CustomNum() + $this->newsNum() + $this->blogNum();
+        $data_num = $this->productNum() + $this->customNum() + $this->newsNum() + $this->blogNum();
         $number = $keyword_num * 18 + $lang_num * $data_num;
         $number = $keyword_num * 18 + $lang_num * $data_num;
         if($number >= 450000){
         if($number >= 450000){
             $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请联系管理员操作！']);
             $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请联系管理员操作！']);
@@ -179,7 +179,7 @@ class CNoticeController extends BaseController
      * @method :post
      * @method :post
      * @time   :2025/1/4 11:21
      * @time   :2025/1/4 11:21
      */
      */
-    public function CustomNum(){
+    public function customNum(){
         $contentModel = new CustomModuleContent();
         $contentModel = new CustomModuleContent();
         $number = $contentModel->counts(['status'=>0]);
         $number = $contentModel->counts(['status'=>0]);
         $settingModel = new SettingNum();
         $settingModel = new SettingNum();

@@ -50,7 +50,8 @@ class ExtensionModuleController extends BaseController
             '4'=>'文件框',
             '4'=>'文件框',
             '5'=>'下拉框',
             '5'=>'下拉框',
             '6'=>'自动生成订单框',
             '6'=>'自动生成订单框',
-            '7'=>'创建时间'
+            '7'=>'创建时间',
+            '8'=>'多级联动框'
         ];
         ];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }