diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs
index c8977101..4f91069e 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/Orders/Order.cs
@@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Orders.Orders
     {
         public virtual Guid? TenantId { get; protected set; }
         
-        public virtual Guid? StoreId { get; protected set; }
+        public virtual Guid StoreId { get; protected set; }
         
         public virtual Guid CustomerUserId { get; protected set; }
         
diff --git a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs
index d362cc7d..748f75be 100644
--- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs
+++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/PaymentRecordOrders/PaymentRecordOrder.cs
@@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Payment.PaymentRecordOrders
     {
         public virtual Guid? TenantId { get; protected set; }
 
-        public virtual Guid? StoreId { get; protected set; }
+        public virtual Guid StoreId { get; protected set; }
         
         public virtual Guid OrderId { get; protected set; }
         
diff --git a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs
index 7aba1f9b..9edf5663 100644
--- a/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs
+++ b/modules/EasyAbp.EShop.Payment/src/EasyAbp.EShop.Payment.Domain/RefundRecords/RefundRecord.cs
@@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Payment.RefundRecords
     {
         public virtual Guid? TenantId { get; protected set; }
         
-        public virtual Guid? StoreId { get; protected set; }
+        public virtual Guid StoreId { get; protected set; }
         
         public virtual Guid OrderId { get; protected set; }
         
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/CreateUpdateProductCategoryDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/CreateUpdateProductCategoryDto.cs
index d6c9624b..63a1ea7d 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/CreateUpdateProductCategoryDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/CreateUpdateProductCategoryDto.cs
@@ -7,7 +7,7 @@ namespace EasyAbp.EShop.Products.ProductCategories.Dtos
     public class CreateUpdateProductCategoryDto
     {
         [DisplayName("ProductCategoryStoreId")]
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
 
         [Required]
         [DisplayName("ProductCategoryCategoryId")]
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/ProductCategoryDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/ProductCategoryDto.cs
index eabb318d..970ef6fb 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/ProductCategoryDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductCategories/Dtos/ProductCategoryDto.cs
@@ -5,7 +5,7 @@ namespace EasyAbp.EShop.Products.ProductCategories.Dtos
 {
     public class ProductCategoryDto : AuditedEntityDto<Guid>
     {
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
 
         public Guid CategoryId { get; set; }
 
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs
index db8d8534..29055457 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs
@@ -9,7 +9,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
     public class CreateUpdateProductDto : IValidatableObject
     {
         [DisplayName("ProductStoreId")]
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
 
         [Required]
         [DisplayName("ProductProductTypeId")]
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/GetProductListDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/GetProductListDto.cs
index 86c584f8..5a04e17b 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/GetProductListDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/GetProductListDto.cs
@@ -5,7 +5,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
 {
     public class GetProductListDto : PagedAndSortedResultRequestDto
     {
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
         
         public Guid? CategoryId { get; set; }
     }
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
index 07bedf2d..153fda48 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
@@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
 {
     public class ProductDto : FullAuditedEntityDto<Guid>
     {
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
 
         public Guid ProductTypeId { get; set; }
 
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
index 172d7be0..1c4c10e1 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
@@ -43,10 +43,8 @@ namespace EasyAbp.EShop.Products.Products
 
                 query = query.Where(p => productIds.Contains(p.Id));
             }
-            else if (input.StoreId.HasValue)
-            {
-                query = query.Where(p => p.StoreId == input.StoreId);
-            }
+            
+            query = query.Where(p => p.StoreId == input.StoreId);
 
             return query;
         }
@@ -141,7 +139,7 @@ namespace EasyAbp.EShop.Products.Products
             return dto;
         }
 
-        protected virtual async Task UpdateProductCategoriesAsync(Guid productId, Guid? storeId, IEnumerable<Guid> categoryIds)
+        protected virtual async Task UpdateProductCategoriesAsync(Guid productId, Guid storeId, IEnumerable<Guid> categoryIds)
         {
             await _productCategoryRepository.DeleteAsync(x => x.ProductId.Equals(productId));
 
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/IProductCategoryRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/IProductCategoryRepository.cs
index 00c3595f..cb380750 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/IProductCategoryRepository.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/IProductCategoryRepository.cs
@@ -8,8 +8,8 @@ namespace EasyAbp.EShop.Products.ProductCategories
 {
     public interface IProductCategoryRepository : IRepository<ProductCategory, Guid>
     {
-        Task<List<ProductCategory>> GetListByCategoryId(Guid categoryId, Guid? storeId, CancellationToken cancellationToken = default);
+        Task<List<ProductCategory>> GetListByCategoryId(Guid categoryId, Guid storeId, CancellationToken cancellationToken = default);
         
-        Task<List<ProductCategory>> GetListByProductId(Guid productId, Guid? storeId, CancellationToken cancellationToken = default);
+        Task<List<ProductCategory>> GetListByProductId(Guid productId, Guid storeId, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/ProductCategory.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/ProductCategory.cs
index 8b2fe284..4bf14527 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/ProductCategory.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductCategories/ProductCategory.cs
@@ -9,7 +9,7 @@ namespace EasyAbp.EShop.Products.ProductCategories
     {
         public virtual Guid? TenantId { get; protected set; }
         
-        public virtual Guid? StoreId { get; protected set; }
+        public virtual Guid StoreId { get; protected set; }
         
         public virtual Guid CategoryId { get; protected set; }
         
@@ -24,7 +24,7 @@ namespace EasyAbp.EShop.Products.ProductCategories
         public ProductCategory(
             Guid id,
             Guid? tenantId,
-            Guid? storeId,
+            Guid storeId,
             Guid categoryId,
             Guid productId,
             int displayOrder = 0
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs
index 26bc7ca5..542f7c71 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs
@@ -11,7 +11,7 @@ namespace EasyAbp.EShop.Products.Products
     {
         public virtual Guid? TenantId { get; protected set; }
         
-        public virtual Guid? StoreId { get; protected set; }
+        public virtual Guid StoreId { get; protected set; }
         
         public virtual Guid ProductTypeId { get; protected set; }
         
@@ -42,7 +42,7 @@ namespace EasyAbp.EShop.Products.Products
         public Product(
             Guid id,
             Guid? tenantId,
-            Guid? storeId,
+            Guid storeId,
             Guid productTypeId,
             string displayName,
             InventoryStrategy inventoryStrategy,
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs
index 20d2c658..0a5f1487 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs
@@ -16,14 +16,14 @@ namespace EasyAbp.EShop.Products.ProductCategories
         {
         }
 
-        public virtual async Task<List<ProductCategory>> GetListByCategoryId(Guid categoryId, Guid? storeId,
+        public virtual async Task<List<ProductCategory>> GetListByCategoryId(Guid categoryId, Guid storeId,
             CancellationToken cancellationToken = default)
         {
             return await GetQueryable().Where(pc => pc.CategoryId == categoryId && pc.StoreId == storeId)
                 .ToListAsync(cancellationToken);
         }
 
-        public virtual async Task<List<ProductCategory>> GetListByProductId(Guid productId, Guid? storeId,
+        public virtual async Task<List<ProductCategory>> GetListByProductId(Guid productId, Guid storeId,
             CancellationToken cancellationToken = default)
         {
             return await GetQueryable().Where(pc => pc.ProductId == productId && pc.StoreId == storeId)
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/CreateModal.cshtml.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/CreateModal.cshtml.cs
index 7d1f3e3b..7758addb 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/CreateModal.cshtml.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/CreateModal.cshtml.cs
@@ -37,7 +37,7 @@ namespace EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product
             _service = service;
         }
 
-        public async Task OnGetAsync(Guid? storeId)
+        public async Task OnGetAsync(Guid storeId)
         {
             ProductTypes =
                 (await _productTypeAppService.GetListAsync(new PagedAndSortedResultRequestDto
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/ViewModels/CreateUpdateProductViewModel.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/ViewModels/CreateUpdateProductViewModel.cs
index 4f8c7163..c5913d77 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/ViewModels/CreateUpdateProductViewModel.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/ViewModels/CreateUpdateProductViewModel.cs
@@ -13,7 +13,7 @@ namespace EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product.ViewM
     {
         [HiddenInput]
         [Display(Name = "ProductStore")]
-        public Guid? StoreId { get; set; }
+        public Guid StoreId { get; set; }
 
         [Required]
         [SelectItems("ProductTypes")]
diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/Stores/IMultiStore.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/Stores/IMultiStore.cs
index 0da32722..d213231b 100644
--- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/Stores/IMultiStore.cs
+++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain.Shared/Stores/IMultiStore.cs
@@ -4,6 +4,6 @@ namespace EasyAbp.EShop.Stores.Stores
 {
     public interface IMultiStore
     {
-        Guid? StoreId { get; }
+        Guid StoreId { get; }
     }
 }
\ No newline at end of file