From 7d5e208f291c57e8d4c49c0c965cc6c736f9b31a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 31 一月 2024 17:31:32 +0800
Subject: [PATCH] Merge branch 'yyk'

---
 Wms/WMS.Entity/SysEntity/SysMaterialCategory.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.Entity/SysEntity/MaterialCategory.cs b/Wms/WMS.Entity/SysEntity/SysMaterialCategory.cs
similarity index 71%
rename from Wms/WMS.Entity/SysEntity/MaterialCategory.cs
rename to Wms/WMS.Entity/SysEntity/SysMaterialCategory.cs
index 0490f6f..bfcb913 100644
--- a/Wms/WMS.Entity/SysEntity/MaterialCategory.cs
+++ b/Wms/WMS.Entity/SysEntity/SysMaterialCategory.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -25,14 +26,15 @@
         public string AreaNo { get; set; }
 
         /// <summary>
-        /// 鎵�灞炰粨搴�
-        /// </summary>
-        public string WareHouseNo { get; set; }
-
-        /// <summary>
         /// 澶囨敞
         /// </summary>
         public string Demo { get; set; }
 
+        [Navigate(NavigateType.OneToOne, nameof(CreateUser))]
+        public SysUserInfor CreateUserInfo { get; set; }
+
+        [Navigate(NavigateType.OneToOne, nameof(UpdateUser))]
+        public SysUserInfor UpdateUserInfo { get; set; }
+
     }
 }

--
Gitblit v1.8.0