From 68f5c0f662486e29ee1af9d92b5635861fde61e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Sat, 10 Oct 2020 17:23:22 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9A=82=E6=97=B6=E6=8C=87=E5=AE=9Aphpoffi?=
 =?UTF-8?q?ce/phpspreadsheet=E7=9A=84=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md   | 3 +++
 composer.json  | 2 +-
 src/common.php | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cc6520..7ca73e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v6.0.119 / 2020-10-10
+- 暂时指定phpoffice/phpspreadsheet的版本
+
 ## v6.0.118 / 2020-10-10
 - 小数门面的四舍五入方法优化
 - IP信息文件调整回旧的方法
diff --git a/composer.json b/composer.json
index 5132533..b77c77d 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
     "qcloud/cos-sdk-v5": "^2.0",
     "qiniu/php-sdk": "^7.2",
     "upyun/sdk": "^3.4",
-    "phpoffice/phpspreadsheet": "^1.14"
+    "phpoffice/phpspreadsheet": "1.12.0"
   },
   "require-dev": {
     "symfony/var-dumper": "^4.2"
diff --git a/src/common.php b/src/common.php
index 29c68b8..0a709ad 100644
--- a/src/common.php
+++ b/src/common.php
@@ -25,7 +25,7 @@ use DtApp\ThinkLibrary\service\SystemService;
 /**
  * 定义当前版本
  */
-const VERSION = '6.0.118';
+const VERSION = '6.0.119';
 
 if (!function_exists('get_ip_info')) {
     /**
-- 
GitLab