Merge branch 'shizhongqi-createShop' into dev

biz-hd/staff/classes/StaffClass.php

@@ -131,7 +131,7 @@ class StaffClass extends BaseClass
         $hasShop = 0;
 
         // 检查管理员是否有自己的门店
-        $shopList = ShopClass::getAllByCondition(['mobile' => $mobile], null, 'id,shopName,mainId,pfShopId,lsShopId,adminId', null, true);
+        $shopList = ShopClass::getAllByCondition(['mobile' => $mobile], null, 'id,shopName,mainId,pfShopId,lsShopId,adminId,ptStyle', null, true);
         if (empty($shopList)) {
             // 情况1：自己没有店，在别人那边当员工，直接退出
             $admin->currentShopId = 0;