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

@@ -22,7 +22,7 @@ class BTemplateModuleController extends BaseController
      * @time   :2023/6/29 11:33
      * @time   :2023/6/29 11:33
      */
      */
     public function lists(BTemplateModuleLogic $BTemplateModuleLogic){
     public function lists(BTemplateModuleLogic $BTemplateModuleLogic){
-        $list = $BTemplateModuleLogic->ModuleList($this->map);
+        $list = $BTemplateModuleLogic->ModuleList($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 }
 }

@@ -21,8 +21,8 @@ class BTemplateModuleLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/6/29 13:35
      * @time   :2023/6/29 13:35
      */
      */
-    public function ModuleList($map){
-        $list = $this->model->list($map);
-        return $this->success($list);
+    public function ModuleList($map,$page,$row,$order = 'created_at',$filed = ['*']){
+        $lists = $this->model->lists($map,$page,$row,$order,$filed);
+        return $this->success($lists);
     }
     }
 }
 }