diff --git a/Directory.Build.props b/Directory.Build.props
index 41488904..f8cc740f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
5.0.1
2.5.1
- 2.0.1
+ 2.0.4
0.8.1
diff --git a/common.props b/common.props
index 0c5ba617..616d451c 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
latest
- 2.4.0
+ 2.4.1
$(NoWarn);CS1591
true
EasyAbp Team
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs
index 183d32e8..8df48aec 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
@@ -46,6 +47,7 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos
public decimal RefundAmount { get; set; }
+ [JsonInclude]
public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
index c2e3e26e..534aa74e 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
@@ -3,11 +3,12 @@ using System.Collections.Generic;
using Volo.Abp.Auditing;
using Volo.Abp.Data;
using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Orders.Orders
{
[Serializable]
- public class OrderEto : IOrder, IFullAuditedObject, IMultiTenant
+ public class OrderEto : ExtensibleObject, IOrder, IFullAuditedObject, IMultiTenant
{
public Guid Id { get; set; }
@@ -55,7 +56,6 @@ namespace EasyAbp.EShop.Orders.Orders
public List OrderLines { get; set; }
- public ExtraPropertyDictionary ExtraProperties { get; set; }
public DateTime CreationTime { get; set; }
public Guid? CreatorId { get; set; }
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs
index 5beb9eae..1eb8a3ff 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs
@@ -1,10 +1,10 @@
using System;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Orders.Orders
{
- [Serializable]
- public class OrderLineEto : IOrderLine
+ public class OrderLineEto : ExtensibleObject, IOrderLine
{
public Guid Id { get; set; }
@@ -45,7 +45,5 @@ namespace EasyAbp.EShop.Orders.Orders
public int RefundedQuantity { get; set; }
public decimal RefundAmount { get; set; }
-
- public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs
index 21502531..e95d901a 100644
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities.Auditing;
@@ -54,6 +55,7 @@ namespace EasyAbp.EShop.Orders.Orders
public virtual decimal RefundAmount { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
protected OrderLine()
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
index 0061b814..188ff539 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentEto.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
using EasyAbp.PaymentService.Payments;
using Volo.Abp.Data;
using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Payments.Payments
{
- [Serializable]
- public class EShopPaymentEto : IPayment, IMultiTenant
+ public class EShopPaymentEto : ExtensibleObject, IPayment, IMultiTenant
{
#region Base properties
@@ -39,8 +39,6 @@ namespace EasyAbp.EShop.Payments.Payments
public DateTime? CanceledTime { get; set; }
- public ExtraPropertyDictionary ExtraProperties { get; set; }
-
#endregion
public List PaymentItems { get; set; } = new List();
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentItemEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentItemEto.cs
index bb889439..e5718cb9 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentItemEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Payments/EShopPaymentItemEto.cs
@@ -2,11 +2,11 @@
using System.Collections.Generic;
using EasyAbp.PaymentService.Payments;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Payments.Payments
{
- [Serializable]
- public class EShopPaymentItemEto : IPaymentItem
+ public class EShopPaymentItemEto : ExtensibleObject, IPaymentItem
{
#region Base properties
@@ -26,8 +26,6 @@ namespace EasyAbp.EShop.Payments.Payments
public decimal PendingRefundAmount { get; set; }
- public ExtraPropertyDictionary ExtraProperties { get; set; }
-
#endregion
public Guid StoreId { get; set; }
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
index d207cafb..11f3595a 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundEto.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
using EasyAbp.PaymentService.Refunds;
using Volo.Abp.Data;
using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Payments.Refunds
{
- [Serializable]
- public class EShopRefundEto : IRefund, IMultiTenant
+ public class EShopRefundEto : ExtensibleObject, IRefund, IMultiTenant
{
#region Base properties
@@ -34,8 +34,6 @@ namespace EasyAbp.EShop.Payments.Refunds
public DateTime? CompletedTime { get; set; }
public DateTime? CanceledTime { get; set; }
-
- public ExtraPropertyDictionary ExtraProperties { get; set; }
#endregion
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundItemEto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundItemEto.cs
index 530c5726..9d5118bb 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundItemEto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Refunds/EShopRefundItemEto.cs
@@ -2,11 +2,11 @@
using System.Collections.Generic;
using EasyAbp.PaymentService.Refunds;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Payments.Refunds
{
- [Serializable]
- public class EShopRefundItemEto : IRefundItem
+ public class EShopRefundItemEto : ExtensibleObject, IRefundItem
{
#region Base properties
@@ -20,8 +20,6 @@ namespace EasyAbp.EShop.Payments.Refunds
public string StaffRemark { get; set; }
- public ExtraPropertyDictionary ExtraProperties { get; set; }
-
#endregion
public Guid StoreId { get; set; }
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs
index d7301c4c..90df1b64 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/PaymentItem.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using EasyAbp.EShop.Stores.Stores;
using EasyAbp.PaymentService.Payments;
using JetBrains.Annotations;
@@ -27,6 +28,7 @@ namespace EasyAbp.EShop.Payments.Payments
public virtual decimal PendingRefundAmount { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
#endregion
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
index ac0da7b7..9aa5a2b8 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/RefundItem.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using EasyAbp.EShop.Stores.Stores;
using EasyAbp.PaymentService.Refunds;
using Volo.Abp.Data;
@@ -19,6 +20,7 @@ namespace EasyAbp.EShop.Payments.Refunds
public virtual string StaffRemark { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; set; }
#endregion
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeEto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeEto.cs
index 566e9642..e7b51cdd 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeEto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeEto.cs
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Products.Products
{
- [Serializable]
- public class ProductAttributeEto : IProductAttribute
+ public class ProductAttributeEto : ExtensibleObject, IProductAttribute
{
public Guid Id { get; set; }
@@ -16,7 +16,5 @@ namespace EasyAbp.EShop.Products.Products
public int DisplayOrder { get; set; }
public ICollection ProductAttributeOptions { get; set; }
-
- public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeOptionEto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeOptionEto.cs
index 72102757..50e9e73e 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeOptionEto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductAttributeOptionEto.cs
@@ -1,10 +1,11 @@
using System;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Products.Products
{
[Serializable]
- public class ProductAttributeOptionEto : IProductAttributeOption
+ public class ProductAttributeOptionEto : ExtensibleObject, IProductAttributeOption
{
public Guid Id { get; set; }
@@ -13,7 +14,5 @@ namespace EasyAbp.EShop.Products.Products
public string Description { get; set; }
public int DisplayOrder { get; set; }
-
- public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductEto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductEto.cs
index 6f67a6b6..732cf1a9 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductEto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductEto.cs
@@ -2,11 +2,11 @@
using System.Collections.Generic;
using Volo.Abp.Data;
using Volo.Abp.MultiTenancy;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Products.Products
{
- [Serializable]
- public class ProductEto : IProduct, IMultiTenant
+ public class ProductEto : ExtensibleObject, IProduct, IMultiTenant
{
public Guid? TenantId { get; set; }
@@ -34,8 +34,6 @@ namespace EasyAbp.EShop.Products.Products
public bool IsHidden { get; set; }
- public ExtraPropertyDictionary ExtraProperties { get; set; }
-
public ICollection ProductAttributes { get; set; }
public ICollection ProductSkus { get; set; }
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
index 845ebb6f..09b047cc 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Products/ProductSkuEto.cs
@@ -1,10 +1,10 @@
using System;
using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
namespace EasyAbp.EShop.Products.Products
{
- [Serializable]
- public class ProductSkuEto : IProductSku
+ public class ProductSkuEto : ExtensibleObject, IProductSku
{
public Guid Id { get; set; }
@@ -25,7 +25,5 @@ namespace EasyAbp.EShop.Products.Products
public string MediaResources { get; set; }
public Guid? ProductDetailId { get; set; }
-
- public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}
\ No newline at end of file
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs
index e291ad9f..cf3d9402 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities.Auditing;
@@ -16,6 +17,7 @@ namespace EasyAbp.EShop.Products.Products
public virtual int DisplayOrder { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
public virtual List ProductAttributeOptions { get; protected set; }
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttributeOption.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttributeOption.cs
index cd9a1413..d3a55fea 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttributeOption.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttributeOption.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities.Auditing;
@@ -16,6 +17,7 @@ namespace EasyAbp.EShop.Products.Products
public virtual int DisplayOrder { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
protected ProductAttributeOption()
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
index e6defdde..f0a3ab3d 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductSku.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
using JetBrains.Annotations;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities.Auditing;
@@ -32,6 +33,7 @@ namespace EasyAbp.EShop.Products.Products
public virtual Guid? ProductDetailId { get; protected set; }
+ [JsonInclude]
public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; }
protected ProductSku()