Merge branch 'zjl_merge_20190716' into development

app/Model/OrderModel.php

@@ -146,7 +146,6 @@ class OrderModel extends Model
                                 case '1': 
                                 case '2': 
                                 case '6': 
-                                case '7': 
                                     $string .= "FIND_IN_SET('pf=".$v."', o.order_source) OR "; 
                                     break;
                                 case '3': 
@@ -158,6 +157,9 @@ class OrderModel extends Model
                                 case '5': 
                                     $string .= "o.order_type = 2 OR ";
                                     break;
+                                case '7': 
+                                    $string .= "o.order_type = 4 OR "; 
+                                    break;
                             }
                         }