v3.4.6

extend/Tnb.Extend.Entitys/Dto/Document/DocumentListOutput.cs

@@ -47,4 +47,19 @@ public class DocumentListOutput
     /// 父级Id.
     /// </summary>
     public string? parentId { get; set; }
+
+    /// <summary>
+    /// 文档下载地址.
+    /// </summary>
+    public string? uploaderUrl { get; set; }
+
+    /// <summary>
+    /// 文件路径.
+    /// </summary>
+    public string? filePath { get; set; }
+
+    /// <summary>
+    /// 是否支持预览.
+    /// </summary>
+    public string? isPreview { get; set; }
 }

extend/Tnb.Extend.Entitys/Dto/Product/ProductCrInput.cs

@@ -87,17 +87,17 @@ public class ProductCrInput
     /// <summary>
     /// 让利金额.
     /// </summary>
-    public decimal partPrice { get; set; }
+    public decimal? partPrice { get; set; }
 
     /// <summary>
     /// 优惠金额.
     /// </summary>
-    public decimal reducedPrice { get; set; }
+    public decimal? reducedPrice { get; set; }
 
     /// <summary>
     /// 折后金额.
     /// </summary>
-    public decimal discountPrice { get; set; }
+    public decimal? discountPrice { get; set; }
 
     /// <summary>
     /// 备注.

extend/Tnb.Extend.Entitys/Dto/Product/ProductInfoOutput.cs

@@ -92,17 +92,17 @@ public class ProductInfoOutput
     /// <summary>
     /// 让利金额.
     /// </summary>
-    public decimal partPrice { get; set; }
+    public decimal? partPrice { get; set; }
 
     /// <summary>
     /// 优惠金额.
     /// </summary>
-    public decimal reducedPrice { get; set; }
+    public decimal? reducedPrice { get; set; }
 
     /// <summary>
     /// 折后金额.
     /// </summary>
-    public decimal discountPrice { get; set; }
+    public decimal? discountPrice { get; set; }
 
     /// <summary>
     /// 备注.

extend/Tnb.Extend.Entitys/Dto/Product/ProductListOutput.cs

@@ -67,4 +67,9 @@ public class ProductListOutput
     /// 联系人.
     /// </summary>
     public string contactName { get; set; }
+
+    /// <summary>
+    /// 子表数据.
+    /// </summary>
+    public List<ProductEntryEntity> productEntryList { get; set; }
 }

extend/Tnb.Extend.Entitys/Dto/ProductCustomer/ProductCustomerListOutput.cs

@@ -7,7 +7,7 @@ namespace JNPF.Extend.Entitys.Dto.Customer;
 /// 客户信息.
 /// </summary>
 [SuppressSniffer]
-public class CustomerListOutput
+public class ProductCustomerListOutput
 {
     /// <summary>
     /// 主键.

extend/Tnb.Extend.Entitys/Entity/BigDataEntity.cs

@@ -1,4 +1,5 @@
 using JNPF.Common.Contracts;
+using JNPF.Extras.DatabaseAccessor.SqlSugar.Models;
 using SqlSugar;
 
 namespace JNPF.Extend.Entitys;

extend/Tnb.Extend.Entitys/Entity/DocumentEntity.cs

@@ -78,4 +78,10 @@ public class DocumentEntity : CLDEntityBase
     /// </summary>
     [SugarColumn(ColumnName = "F_SORTCODE")]
     public long? SortCode { get; set; }
+
+    /// <summary>
+    /// 下载地址.
+    /// </summary>
+    [SugarColumn(ColumnName = "F_UPLOADERURL")]
+    public string? UploaderUrl { get; set; }
 }

extend/Tnb.Extend.Entitys/Entity/ProductCustomerEntity.cs

@@ -7,7 +7,7 @@ namespace JNPF.Extend.Entitys.Entity;
 /// 客户信息.
 /// </summary>
 [SugarTable("ext_customer", TableDescription = "客户信息")]
-public class CustomerEntity : CLEntityBase
+public class ProductCustomerEntity : CLEntityBase
 {
     /// <summary>
     /// 编码.

extend/Tnb.Extend.Entitys/Entity/ProductEntity.cs

@@ -159,19 +159,19 @@ public class ProductEntity : EntityBase<string>
     /// 让利金额.
     /// </summary>
     [SugarColumn(ColumnName = "F_PartPrice")]
-    public decimal PartPrice { get; set; }
+    public decimal? PartPrice { get; set; }
 
     /// <summary>
     /// 优惠金额.
     /// </summary>
     [SugarColumn(ColumnName = "F_ReducedPrice")]
-    public decimal ReducedPrice { get; set; }
+    public decimal? ReducedPrice { get; set; }
 
     /// <summary>
     /// 折后金额.
     /// </summary>
     [SugarColumn(ColumnName = "F_DiscountPrice")]
-    public decimal DiscountPrice { get; set; }
+    public decimal? DiscountPrice { get; set; }
 
     /// <summary>
     /// 备注.

extend/Tnb.Extend.Entitys/Entity/ProductgoodsEntity.cs

@@ -9,7 +9,7 @@ namespace JNPF.Extend.Entitys;
 /// </summary>
 [SugarTable("ext_productgoods")]
 [Tenant(ClaimConst.TENANTID)]
-public class ProductgoodsEntity
+public class ProductGoodsEntity
 {
     /// <summary>
     /// 主键.