From f33b7591978f4acea5630ad453f477c1240d90d6 Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期四, 20 三月 2025 10:35:14 +0800
Subject: [PATCH] 解决冲突

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Sys_User.cs |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Sys_User.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Sys_User.cs"
index fec93b2..ac6a4b9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Sys_User.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/Sys_User.cs"
@@ -29,6 +29,13 @@
         public string UserName { get; set; }
 
         /// <summary>
+        ///鍗″彿
+        /// </summary>
+        [SugarColumn( IsNullable = true, ColumnDescription = "鍗″彿")]
+        public int CardNumber { get; set; }
+
+
+        /// <summary>
         /// 瑙掕壊ID
         /// </summary>
         [SugarColumn(IsNullable = false, ColumnDescription = "瑙掕壊ID")]

--
Gitblit v1.9.3