Merge branch 'ttxh' of http://git.huaml.com/zhh/huahuibao into ttxh

app-hd/controllers/BaseController.php

@@ -2,13 +2,11 @@
 
 namespace hd\controllers;
 
-use biz\admin\classes\AdminClass as ClassesAdminClass;
 use biz\shop\classes\MainClass;
 use biz\sj\classes\SjClass;
 use bizHd\admin\classes\AdminClass;
 use biz\shop\classes\ShopAdminClass;
 use biz\sj\classes\MerchantExtendClass;
-use biz\sj\services\MerchantService;
 use bizHd\merchant\services\ShopService;
 use common\components\dict;
 use common\components\jwt;

biz/sj/services/MerchantService.php

@@ -157,7 +157,6 @@ class MerchantService extends BaseService
             'shopName' => '首店',
             'sjId' => $sjId,
             'merchantName' => $sjName,
-            'openTime' => '8:00 - 23:00',
             'telephone' => $mobile,
             'default' => 1,
             'mainId' => $mainId,