Merge branch 'master' into dev

app-ghs/controllers/ShopController.php

@@ -49,7 +49,7 @@ class ShopController extends BaseController
             util::fail('请填写名称');
         }
         $shop = $this->shop;
-        $shop->sjName = $name;
+        $shop->merchantName = $name;
         $shop->save();
         $sjId = $shop->sjId;
         $sj = MerchantClass::getById($sjId, true);

app-hd/controllers/ShopController.php

@@ -46,7 +46,7 @@ class ShopController extends BaseController
             util::fail('请填写名称');
         }
         $shop = $this->shop;
-        $shop->sjName = $name;
+        $shop->merchantName = $name;
         $shop->save();
         $sjId = $shop->sjId;
         $sj = SjClass::getById($sjId, true);