Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Myshipping.Application.xml

@@ -8832,7 +8832,7 @@
             船公司代号
             </summary>
         </member>
-        <member name="P:Myshipping.Application.RulesEngineOrderBookingMainBusinessInfo.Carrirer">
+        <member name="P:Myshipping.Application.RulesEngineOrderBookingMainBusinessInfo.Carrier">
             <summary>
             船公司
             </summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1525,9 +1525,13 @@ namespace Myshipping.Application
                 var listOut = allList.Where(x => !arr.Contains(x.TypeCode)).ToList();
                 listReult.AddRange(listOut);
 
+                return listReult;
+            }
+            else
+            {
+                return allList;
             }
 
-            return listReult;
         }
         #endregion