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

+<?php
+
+namespace App\Console\Commands\MonthlyCount;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class InquiryMonthlyCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'yesterday_count';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '统计昨日数据';
+
+    /**
+     * @remark :询盘月报告
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/30 9:32
+     */
+    public function handle(){
+        // 获取上个月的开始时间
+        $startTime = Carbon::now()->subMonth()->startOfMonth();
+        // 获取上个月的结束时间
+        $endTime = Carbon::now()->subMonth()->endOfMonth();
+    }
+}

@@ -4,8 +4,6 @@ namespace App\Console\Commands\YesterdayCount;
 
 
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
-use App\Http\Logic\Aside\Project\ProjectLogic;
-use App\Models\CustomerVisit\CustomerVisitItem;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;

@@ -201,6 +201,31 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('files')->group(function () {
     Route::prefix('files')->group(function () {
         Route::post('/upload', [\App\Http\Controllers\File\FileController::class, 'upload'])->name('files_upload');
         Route::post('/upload', [\App\Http\Controllers\File\FileController::class, 'upload'])->name('files_upload');
     });
     });
+//    // 公共主题模版
+//    Route::prefix('template')->group(function () {
+//        Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
+//        Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
+//        Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
+//        Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
+//
+//        // 左侧模块
+//        Route::prefix('module')->group(function () {
+//            Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
+//            Route::any('/save', [Aside\Template\ATemplateModuleController::class, 'save'])->name('admin.ATemplateModule_save');
+//            Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
+//            Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
+//            Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
+//        });
+//    });
+});
+
+//无需登录验证的路由组
+Route::group([], function () {
+    Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
+    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
+    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
+    Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
+    //放开模版上传
     // 公共主题模版
     // 公共主题模版
     Route::prefix('template')->group(function () {
     Route::prefix('template')->group(function () {
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
@@ -219,13 +244,4 @@ Route::middleware(['aloginauth'])->group(function () {
     });
     });
 });
 });
 
 
-//无需登录验证的路由组
-Route::group([], function () {
-    Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
-    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
-    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
-
-    Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
-});
-