Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ConsoleController.php

@@ -268,7 +268,7 @@ class ConsoleController extends BaseController
         //查看财务的权限
         $lookMoney = ShopAdminClass::lookMoneyPower($this->shopAdmin, $this->shop);
 
-        $warning = '凌晨2:40~2:50，系统升级，暂停使用10分钟，有问题请提前联系';
+        $warning = '';
         $warningUrl = '';
         //$warning = '';
         //$warningUrl = '/admin/notice/warning';

app-hd/controllers/ConsoleController.php

@@ -222,7 +222,7 @@ class ConsoleController extends BaseController
             ["name" => "客户充值", "img" => "ghs/home/kcyjs2.png", "url" => "/admin/recharge/rechargeCode", 'pf' => 1,],
         ];
 
-        $warning = '凌晨2:40~2:50，系统升级，暂停使用10分钟，有问题请提前联系';
+        $warning = '';
         //$warning = '本月4号凌晨4点~5点系统升级，暂停使用';
         util::success([
             'warning' => $warning,