From b61587868bcd13232b4c5da0dcdb0a72ac5d3211 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 29 Nov 2019 12:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B9=BF=E5=91=8A=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/FileController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php
index 44f7c7a50..0e1304463 100644
--- a/Application/Admin/Controller/FileController.class.php
+++ b/Application/Admin/Controller/FileController.class.php
@@ -209,9 +209,9 @@ class FileController extends AdminController
         ); //TODO:上传到远程服务器
 
         // 添加水印
-        if ($_REQUEST['flag']) {
-            $this->addWatermarkOnPic($info['download']);
-        }
+//        if ($_REQUEST['flag']) {
+//            $this->addWatermarkOnPic($info['download']);
+//        }
 
         /* 记录图片信息 */
         if ($info) {