作者 lyh

Merge branch 'dev' into develop

@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 /storage 4 /storage
5 /vendor 5 /vendor
6 /uploads 6 /uploads
  7 +composer.json
7 .env 8 .env
8 .env.backup 9 .env.backup
9 .phpunit.result.cache 10 .phpunit.result.cache
@@ -166,8 +166,8 @@ class ComController extends BaseController @@ -166,8 +166,8 @@ class ComController extends BaseController
166 'date'=>$start_time, 166 'date'=>$start_time,
167 'compliance_day'=>2351, 167 'compliance_day'=>2351,
168 'service_day'=>1233, 168 'service_day'=>1233,
169 - 'created_at'=>$start_time,  
170 - 'updated_at'=>$start_time, 169 + 'created_at'=>$start_time.' 00:00:00',
  170 + 'updated_at'=>$start_time.' 00:00:00',
171 ]; 171 ];
172 } 172 }
173 DB::table('gl_count')->insert($data); 173 DB::table('gl_count')->insert($data);
@@ -13,10 +13,7 @@ @@ -13,10 +13,7 @@
13 "intervention/image": "^2.7", 13 "intervention/image": "^2.7",
14 "laravel/framework": "^8.75", 14 "laravel/framework": "^8.75",
15 "laravel/sanctum": "^2.11", 15 "laravel/sanctum": "^2.11",
16 - "laravel/tinker": "^2.5",  
17 - "mongodb/mongodb": "^1.6",  
18 - "phpoffice/phpspreadsheet": "^1.28",  
19 - "mrgoon/aliyun-sms": "^2.0" 16 + "laravel/tinker": "^2.5"
20 }, 17 },
21 "require-dev": { 18 "require-dev": {
22 "facade/ignition": "^2.5", 19 "facade/ignition": "^2.5",
@@ -62,6 +59,7 @@ @@ -62,6 +59,7 @@
62 } 59 }
63 }, 60 },
64 "config": { 61 "config": {
  62 + "platform-check": false,
65 "optimize-autoloader": true, 63 "optimize-autoloader": true,
66 "preferred-install": "dist", 64 "preferred-install": "dist",
67 "sort-packages": true 65 "sort-packages": true