From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:28 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Entity/WcsTask.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsTask.cs b/Admin.NET/WCS.Application/Entity/WcsTask.cs
index 0b5f99e..a5a6e9e 100644
--- a/Admin.NET/WCS.Application/Entity/WcsTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -101,13 +101,13 @@
/// 鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "Qty", ColumnDescription = "鏁伴噺")]
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
/// <summary>
/// 鎷嗗灈鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "CompleteQty", ColumnDescription = "鎷嗗灈鏁伴噺")]
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// 鏄惁缁戝畾
--
Gitblit v1.8.0