From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 a9f7638..181de85 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
@@ -36,7 +37,7 @@
         /// <summary>
         /// 鐗╂枡绫诲瀷
         /// </summary>
-        public int? MaterialType { get; set; }
+        public long? MaterialType { get; set; }
         
         /// <summary>
         /// 鐗╂枡缁�
@@ -51,7 +52,7 @@
         /// <summary>
         /// ABC鍒嗙被
         /// </summary>
-        public int? ABCClass { get; set; }
+        public ABCClassEnum? ABCClass { get; set; }
         
         /// <summary>
         /// 鐗╂枡瑙勬牸

--
Gitblit v1.9.3