gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'main' (#97) from 362270511/Admin.NET.Pro:main into main

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/97
This commit is contained in:
zuohuaijun 2024-08-15 17:38:07 +08:00
commit 89997113e7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin.NET/Admin.NET.Core/Entity/SysWechatPay.cs
View File

@ -17,14 +17,14 @@ public partial class SysWechatPay : EntityBase
/// <summary> /// <summary>
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联商户订单号")] [SugarColumn(ColumnDescription = "OrderId")]
public virtual string OrderId { get; set; } public virtual string? OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联商户订单状态")] [SugarColumn(ColumnDescription = "OrderStatus")]
public virtual string OrderStatus { get; set; } public virtual string? OrderStatus { get; set; }
/// <summary> /// <summary>
/// 微信商户号 /// 微信商户号
@ -141,7 +141,7 @@ public partial class SysWechatPay : EntityBase
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "备注")] [SugarColumn(ColumnDescription = "备注", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>

6
Admin.NET/Admin.NET.Core/Entity/SysWechatRefund.cs
View File

@ -69,13 +69,13 @@ public class SysWechatRefund : EntityBase
/// 关联的商户订单号 /// 关联的商户订单号
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)] [SugarColumn(ColumnDescription = "关联的用户订单号", Length = 256)]
public string OrderId { get; set; } public string? OrderId { get; set; }
/// <summary> /// <summary>
/// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) /// 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)] [SugarColumn(ColumnDescription = "关联的商户订单状态", Length = 32)]
public string OrderStatus { get; set; } public string? OrderStatus { get; set; }
/// <summary> /// <summary>
/// 关联的商户商品编码 /// 关联的商户商品编码
@ -116,6 +116,6 @@ public class SysWechatRefund : EntityBase
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "备注")] [SugarColumn(ColumnDescription = "备注", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public string? Remark { get; set; } public string? Remark { get; set; }
} }