Merge branch 'master' into dev

app-hd/controllers/ConsoleController.php

@@ -108,8 +108,8 @@ class ConsoleController extends BaseController
         $lookMoney = \bizGhs\shop\classes\ShopAdminClass::lookMoneyPower($this->shopAdmin, $this->shop);
         $warning = '';
         $warningUrl = '';
-        //$warning = '挂账和结账重大调整 查看 >';
-        //$warningUrl = '/admin/notice/warning';
+        $warning = '挂账和结账重大调整 查看 >';
+        $warningUrl = '/admin/notice/warning';
 
         util::success([
             'asset' => $this->main,