From b9a9237665bed220732d044e74225efe3926a0b1 Mon Sep 17 00:00:00 2001
From: Stranger <stranger1688@vip.qq.com>
Date: Thu, 8 Feb 2018 12:34:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=A6=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E8=A1=A8=E6=A0=BC=E5=AF=BC=E5=85=A5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=86=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/library/traits/Backend.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php
index 4e2627d8e..829fa1216 100644
--- a/application/admin/library/traits/Backend.php
+++ b/application/admin/library/traits/Backend.php
@@ -343,7 +343,7 @@ trait Backend
         {
             for ($currentColumn = 0; $currentColumn < $maxColumnNumber; $currentColumn++)
             {
-                $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue();
+                $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getCalculatedValue();
                 $fields[] = $val;
             }
         }
@@ -353,7 +353,7 @@ trait Backend
             $values = [];
             for ($currentColumn = 0; $currentColumn < $maxColumnNumber; $currentColumn++)
             {
-                $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue();
+                $val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getCalculatedValue();
                 $values[] = is_null($val) ? '' : $val;
             }
             $row = [];
-- 
Gitee


From b79c8d0fcf76f95d8225d73ce6d196f05c97077c Mon Sep 17 00:00:00 2001
From: Strangere <stranger1688@vip.qq.comm>
Date: Wed, 28 Mar 2018 17:16:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=8F=B3=E8=BE=B9=E5=AD=97=E7=AC=A6=E4=B8=80=E5=8D=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/config.php b/application/config.php
index 96299e93f..3f165de6c 100755
--- a/application/config.php
+++ b/application/config.php
@@ -234,9 +234,9 @@ return [
         //使用中文验证码
         'useZh'    => false,
         // 验证码图片高度
-        'imageH'   => 30,
+        'imageH'   => 40,
         // 验证码图片宽度
-        'imageW'   => 100,
+        'imageW'   => 130,
         // 验证码位数
         'length'   => 4,
         // 验证成功后是否重置
-- 
Gitee