销售端 合并订单查询过滤条件修改

fs-company/src/main/java/com/fs/company/controller/live/OrderController.java

@@ -63,9 +63,9 @@ public class OrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(MergedOrderQueryParam param)
     {
-        if(param.getOrderTypeFilter() == null || param.getOrderTypeFilter().equals("2")){
+/*        if(param.getOrderTypeFilter() == null || param.getOrderTypeFilter().equals("2")){
             return getDataTable(new ArrayList<>());
-        }
+        }*/
         CompanyUser user = SecurityUtils.getLoginUser().getUser();
         param.setCompanyId(user.getCompanyId());
        if (user.getUserType().equals("01")){