Merge branch 'master' into redesign‌-260706

app-ghs/controllers/OrderController.php

@@ -994,7 +994,7 @@ class OrderController extends BaseController
             ini_set('memory_limit', '2045M');
             set_time_limit(0);
             if (!isset($where['payTime'])) {
-                util::fail('请选时间段');
+                util::fail('请选 账单日期 和 时间段');
             }
             $start = $where['payTime'][1][0];
             $end = $where['payTime'][1][1];

common/config/main-local.php

@@ -17,4 +17,4 @@ if (getenv('YII_ENV') == 'production') {
         ],
     ];
 }
-return $config;
+return $config;