萤火科技 преди 1 година
родител
ревизия
38b56bc056
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      app/common/enum/DiscountType.php
  2. 2 2
      app/store/model/Express.php

+ 2 - 2
app/common/enum/DiscountType.php

@@ -13,8 +13,8 @@ declare (strict_types=1);
 namespace app\common\enum;
 
 /**
- * 枚举类:商品的优惠方式
- * Class OrderType
+ * 枚举类:订单优惠方式
+ * Class DiscountType
  * @package app\common\enum
  */
 class DiscountType extends EnumBasics

+ 2 - 2
app/store/model/Express.php

@@ -72,12 +72,12 @@ class Express extends ExpressModel
     /**
      * 根据物流公司名称获取列表记录
      * @param array $expressNames
-     * @return array
+     * @return Express[]|array|\think\Collection
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    private function getListByExpressName(array $expressNames): array
+    private function getListByExpressName(array $expressNames)
     {
         return (new static)->where('express_name', 'in', $expressNames)
             ->where('is_delete', '=', 0)