Merge branch 'master' into dev

biz/shop/classes/ShopClass.php

@@ -211,7 +211,8 @@ class ShopClass extends BaseClass
             self::updateByCondition(['sjId' => $sjId], ['default' => 0]);
         }
         $data['packCost'] = isset($data['packCost']) && $data['packCost'] > 0 ? $data['packCost'] : 0;
-        $data['cgUnitType'] = isset($data['cgUnitType']) ? $data['cgUnitType'] : 0;
+        $data['cgUnitType'] = $data['cgUnitType'] ?? 0;
+        $data['saleHour']   = $data['saleHour'] ?? 0;
         $respond = self::updateById($id, $data);
 
         $ptStyle = $shop['ptStyle'] ?? dict::getDict('ptStyle', 'hd');