From 833c76cfe3e33a8225051405623711ffceccff2e Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 19 一月 2026 16:50:21 +0800
Subject: [PATCH] 合并冲突
---
LB_SmartVisionCommon/UserData.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/LB_SmartVisionCommon/UserData.cs b/LB_SmartVisionCommon/UserData.cs
index 4a09bcf..24b2f03 100644
--- a/LB_SmartVisionCommon/UserData.cs
+++ b/LB_SmartVisionCommon/UserData.cs
@@ -33,12 +33,14 @@
/// 鍛樺伐璐﹀彿
/// </summary>
[Category("RecordUserData"), PropertyOrder(3)]
- [DisplayName("璐﹀彿")]
+ [DisplayName("鍛樺伐璐﹀彿")]
[Browsable(true)]
public string EmployeeAccount { get; set; }
/// <summary>
/// 鍛樺伐瀵嗙爜
/// </summary>
+ [Category("RecordUserData"), PropertyOrder(4)]
+ [DisplayName("鍛樺伐瀵嗙爜")]
[Browsable(false)]
public string EmployeePassword { get; set; }
/// <summary>
--
Gitblit v1.9.3