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

app-ghs/controllers/AuthController.php

@@ -684,7 +684,7 @@ class AuthController extends PublicController
     {
         $version = getenv('GHS_NEW_APK_VERSION') == false ? '100' : getenv('GHS_NEW_APK_VERSION');
         $mustUpdate = getenv('GHS_NEW_APK_VERSION_MUST_UPDATE') == false ? 0 : getenv('GHS_NEW_APK_VERSION_MUST_UPDATE');
-        $updateText = '开单优化；修复扫码收款问题';
+        $updateText = '零售系统上线升级';
         util::success(['version' => $version, 'mustUpdate' => $mustUpdate, 'updateText' => $updateText]);
     }
 

app-ghs/controllers/ConsoleController.php

@@ -266,8 +266,8 @@ class ConsoleController extends BaseController
 
         $warning = '';
         $warningUrl = '';
-        $warning = '------上班第一件事！！！！------重要！！！！-------，店里有用收银机的，收银机上用了花掌柜的，需要手动更新，否则无法开单，点此查看如何更新。没用收银机的可以忽略。';
-        $warningUrl = '/admin/notice/warning';
+        //$warning = '';
+        //$warningUrl = '/admin/notice/warning';
 
         util::success([
             'asset' => $this->main,

console/controllers/GhsInfoController.php

@@ -27,6 +27,7 @@ class GhsInfoController extends Controller
                     $mobile = $shop->mobile;
                     if (!empty($mobile)) {
                         GhsClass::updateById($ghsId, ['mobile' => $mobile]);
+                        echo $mobile . "\n";
                     }
                 }
             }