Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -312,7 +312,7 @@ class ConsoleController extends BaseController
 
         $warning = '';
         $warningUrl = '';
-        $warning = '本页右上方，暂不显示昨天收入金额';
+        //$warning = '本页右上方，暂不显示昨天收入金额';
         //$warningUrl = '/admin/notice/warning';
 
         util::success([

app-hd/controllers/ShopController.php

@@ -137,8 +137,8 @@ class ShopController extends BaseController
         $shop = $this->shop->attributes;
         $shop['reachVip'] = $shopExt['reachVip'];
 
-        //$shop['warning'] = '';
-        $shop['warning'] = '明天凌晨1:00~2:00系统升级，暂停使用';
+        $shop['warning'] = '';
+        //$shop['warning'] = '明天凌晨1:00~2:00系统升级，暂停使用';
 
         util::success($shop);
     }