Merge branch 'zjl_adjust_20181026' into development

app/Model/OrderModel.php

@@ -79,7 +79,7 @@ class OrderModel extends Model
                         if ($map['order_type'] == 1) { // 订单编号
                             $query->where('o.order_sn', '=', $map['order_contain']);
                         } else if ($map['order_type'] == 2) { // 型号名称
-                            $query->whereIn('it.goods_name', '=', $map['order_contain']);
+                            $query->where('it.goods_name', '=', $map['order_contain']);
                         } else { // 会员账号
                             if (preg_match('/@/', $map['order_contain'])) {
                                 $query->where('u.email', '=', $map['order_contain']);