Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.Business/TestBusiness.cs

@@ -185,7 +185,7 @@ namespace BBWY.Server.Business
                     var orderIdList = fsql.Select<Order>()
                                           .Where(o => o.ShopId == shopId &&
                                                       o.OrderState != Enums.OrderState.已取消 &&
-                                                      o.StorageType != Enums.StorageType.SD &&
+                                                      o.StorageType != null && o.StorageType != Enums.StorageType.SD &&
                                                       o.StartTime >= request.StartTime &&
                                                       o.StartTime <= request.EndTime)
                                           .WhereIf(!string.IsNullOrEmpty(request.OrderId), o => o.Id == request.OrderId)