Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -281,4 +281,4 @@ class ConsoleController extends BaseController
         util::success(['dict' => $dict, 'shop' => $shop]);
     }
 
-}
+}