From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs"
index a38981a..99c6a1e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs"
@@ -20,7 +20,7 @@
         /// 鐢ㄦ埛ID
         /// </summary>
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "鐢ㄦ埛ID")]
-        public int User_Id { get; set; }
+        public int UserId { get; set; }
 
         /// <summary>
         ///甯愬彿
@@ -32,7 +32,7 @@
         /// 瑙掕壊ID
         /// </summary>
         [SugarColumn(IsNullable = false, ColumnDescription = "瑙掕壊ID")]
-        public int Role_Id { get; set; }
+        public int RoleId { get; set; }
 
         /// <summary>
         /// 瑙掕壊鍚嶇О
@@ -74,7 +74,7 @@
         /// 閮ㄩ棬ID
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDescription = "閮ㄩ棬ID")]
-        public int? Dept_Id { get; set; }
+        public int? DeptId { get; set; }
 
         /// <summary>
         /// 閭

--
Gitblit v1.9.3