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

@@ -156,7 +156,7 @@ class ComController extends BaseController
         // 获取上个月的结束时间
         // 获取上个月的结束时间
         $endTime = Carbon::now()->subMonth()->endOfMonth();
         $endTime = Carbon::now()->subMonth()->endOfMonth();
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
-            if($startTime <= $v['submit_time']){
+            if(($startTime <= $v['submit_time']) && $v['submit_time'] <= $endTime){
 
 
             }
             }
         }
         }

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