From 9ba89815f653c07a61eed3fce8d737f74c810881 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:59:48 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
index 697f97c..ca8b5de 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -1,4 +1,5 @@
-锘縰sing Admin.NET.Core.Util.LowCode.Dto;
+锘縰sing Admin.NET.Core;
+using Admin.NET.Core.Util.LowCode.Dto;
using System;
namespace Admin.NET.Application
@@ -46,12 +47,14 @@
/// <summary>
/// ABC鍒嗙被鍚嶇О
/// </summary>
- public string ABCClassName { get; set; }
+ public string ABCClassName { get {
+ return ABCClass!=null? ABCClass.ToString():string.Empty;
+ } }
/// <summary>
/// ABC鍒嗙被
/// </summary>
- public int? ABCClass { get; set; }
+ public ABCClassEnum? ABCClass { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
@@ -162,7 +165,7 @@
public List<WmsSubstituteGoodOutput> SubstituteGoodList { get; set; }
/// <summary>
- /// 寰�鏉ュ叧绯�
+ /// 寰�鏉ュ崟浣�
/// </summary>
public List<BaseCustomerOutput> BaseCustomerList { get; set; }
}
--
Gitblit v1.9.3